Changeset: e13b7117093b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e13b7117093b
Modified Files:
        MonetDB/MonetDB.spec
        MonetDB4/MonetDB-server.spec
        MonetDB5/MonetDB-server.spec
        buildtools/conf/MonetDB.m4
        clients/MonetDB-client.spec
        geom/MonetDB-geom.spec
        pathfinder/MonetDB-XQuery.spec
        sql/ChangeLog.Jun2010
        sql/MonetDB-SQL.spec
        testing/MonetDB-testing.spec
Branch: default
Log Message:

Merge with Jun2010 branch.


diffs (truncated from 1228 to 300 lines):

diff -r fec324448e55 -r e13b7117093b .hgtags
--- a/.hgtags   Mon Aug 23 09:48:20 2010 +0200
+++ b/.hgtags   Mon Aug 23 10:41:27 2010 +0200
@@ -421,3 +421,4 @@
 9aa479df22dda265b8c685f9e15b0899244b0184 Jun2010_3
 9aa479df22dda265b8c685f9e15b0899244b0184 Jun2010_3
 a6dd584e5bee4d0ec428e6aade193c263c55cdb3 Jun2010_3
+19ede2d368c6cba18d6b67cd8bde9d51af2ac9f8 Jun2010_5
diff -r fec324448e55 -r e13b7117093b MonetDB/ChangeLog-Archive
--- a/MonetDB/ChangeLog-Archive Mon Aug 23 09:48:20 2010 +0200
+++ b/MonetDB/ChangeLog-Archive Mon Aug 23 10:41:27 2010 +0200
@@ -1,6 +1,11 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Fri Aug 20 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.5-20100823
+- Fixed a bug where some internal reference counting was done incorrectly,
+  causing an infinite loop when exiting the server due to it being killed.
+  This bug probably only manifested itself in MonetDB/XQuery.  Bug 2658.
+
 * Mon May 31 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.1-20100618
 - Updated Vendor information.
 
diff -r fec324448e55 -r e13b7117093b MonetDB/ChangeLog.Jun2010
--- a/MonetDB/ChangeLog.Jun2010 Mon Aug 23 09:48:20 2010 +0200
+++ b/MonetDB/ChangeLog.Jun2010 Mon Aug 23 10:41:27 2010 +0200
@@ -1,8 +1,3 @@
 # ChangeLog file for MonetDB
 # This file is updated with Maddlog
 
-* Fri Aug 20 2010 Sjoerd Mullender <sjo...@acm.org>
-- Fixed a bug where some internal reference counting was done incorrectly,
-  causing an infinite loop when exiting the server due to it being killed.
-  This bug probably only manifested itself in MonetDB/XQuery.  Bug 2658.
-
diff -r fec324448e55 -r e13b7117093b MonetDB/MonetDB.spec
--- a/MonetDB/MonetDB.spec      Mon Aug 23 09:48:20 2010 +0200
+++ b/MonetDB/MonetDB.spec      Mon Aug 23 10:41:27 2010 +0200
@@ -26,7 +26,7 @@
 Group: Applications/Databases
 License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
 URL: http://monetdb.cwi.nl/
-Source: 
http://dev.monetdb.org/downloads/sources/Jun2010-SP1/%{name}-%{version}.tar.gz
+Source: 
http://dev.monetdb.org/downloads/sources/Jun2010-SP2/%{name}-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: zlib-devel, bzip2-devel, openssl-devel
@@ -106,6 +106,14 @@
 %{_libdir}/libbat.so
 
 %changelog
+* Mon Aug 23 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.5-20100823
+- Rebuilt.
+
+* Fri Aug 20 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.5-20100823
+- Fixed a bug where some internal reference counting was done incorrectly,
+  causing an infinite loop when exiting the server due to it being killed.
+  This bug probably only manifested itself in MonetDB/XQuery.  Bug 2658.
+
 * Tue Jul 13 2010 Sjoerd Mullender <sjo...@acm.org> - 1.38.3-20100713
 - Rebuilt.
 
diff -r fec324448e55 -r e13b7117093b MonetDB/debian/changelog
--- a/MonetDB/debian/changelog  Mon Aug 23 09:48:20 2010 +0200
+++ b/MonetDB/debian/changelog  Mon Aug 23 10:41:27 2010 +0200
@@ -1,3 +1,17 @@
+monetdb (1.38.5-20100823) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Mon, 23 Aug 2010 10:13:12 +0200
+
+monetdb (1.38.5-20100823) unstable; urgency=low
+
+  * Fixed a bug where some internal reference counting was done incorrectly,
+    causing an infinite loop when exiting the server due to it being killed.
+    This bug probably only manifested itself in MonetDB/XQuery.  Bug 2658.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Fri, 20 Aug 2010 10:13:11 +0200
+
 monetdb (1.38.3-20100713) unstable; urgency=low
 
   * Rebuilt.
diff -r fec324448e55 -r e13b7117093b MonetDB4/ChangeLog-Archive
--- a/MonetDB4/ChangeLog-Archive        Mon Aug 23 09:48:20 2010 +0200
+++ b/MonetDB4/ChangeLog-Archive        Mon Aug 23 10:41:27 2010 +0200
@@ -1,6 +1,11 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Thu Jul 22 2010 Sjoerd Mullender <sjo...@acm.org> - 4.38.5-20100823
+- Slight change to Fedora, Debian, Ubuntu installers: the database
+  directory now has the group setuid bit set so that new databases
+  inherit the group ownership (monetdb).
+
 * Mon May 31 2010 Sjoerd Mullender <sjo...@acm.org> - 4.38.1-20100618
 - Updated Vendor information.
 
diff -r fec324448e55 -r e13b7117093b MonetDB4/ChangeLog.Jun2010
--- a/MonetDB4/ChangeLog.Jun2010        Mon Aug 23 09:48:20 2010 +0200
+++ b/MonetDB4/ChangeLog.Jun2010        Mon Aug 23 10:41:27 2010 +0200
@@ -1,8 +1,3 @@
 # ChangeLog file for MonetDB4
 # This file is updated with Maddlog
 
-* Thu Jul 22 2010 Sjoerd Mullender <sjo...@acm.org>
-- Slight change to Fedora, Debian, Ubuntu installers: the database
-  directory now has the group setuid bit set so that new databases
-  inherit the group ownership (monetdb).
-
diff -r fec324448e55 -r e13b7117093b MonetDB4/MonetDB-server.spec
--- a/MonetDB4/MonetDB-server.spec      Mon Aug 23 09:48:20 2010 +0200
+++ b/MonetDB4/MonetDB-server.spec      Mon Aug 23 10:41:27 2010 +0200
@@ -26,7 +26,7 @@
 Group: Applications/Databases
 License:   MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
 URL: http://monetdb.cwi.nl/
-Source: 
http://dev.monetdb.org/downloads/sources/Jun2010-SP1/MonetDB4-server-%{version}.tar.gz
+Source: 
http://dev.monetdb.org/downloads/sources/Jun2010-SP2/MonetDB4-server-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires(pre): shadow-utils
@@ -217,6 +217,14 @@
 %{_libdir}/libembeddedmil.so
 
 %changelog
+* Mon Aug 23 2010 Sjoerd Mullender <sjo...@acm.org> - 4.38.5-20100823
+- Rebuilt.
+
+* Thu Jul 22 2010 Sjoerd Mullender <sjo...@acm.org> - 4.38.5-20100823
+- Slight change to Fedora, Debian, Ubuntu installers: the database
+  directory now has the group setuid bit set so that new databases
+  inherit the group ownership (monetdb).
+
 * Tue Jul 13 2010 Sjoerd Mullender <sjo...@acm.org> - 4.38.3-20100713
 - Rebuilt.
 
diff -r fec324448e55 -r e13b7117093b MonetDB4/debian/changelog
--- a/MonetDB4/debian/changelog Mon Aug 23 09:48:20 2010 +0200
+++ b/MonetDB4/debian/changelog Mon Aug 23 10:41:27 2010 +0200
@@ -1,3 +1,17 @@
+monetdb4-server (4.38.5-20100823) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Mon, 23 Aug 2010 10:13:12 +0200
+
+monetdb4-server (4.38.5-20100823) unstable; urgency=low
+
+  * Slight change to Fedora, Debian, Ubuntu installers: the database
+    directory now has the group setuid bit set so that new databases
+    inherit the group ownership (monetdb).
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Thu, 22 Jul 2010 10:13:12 +0200
+
 monetdb4-server (4.38.3-20100713) unstable; urgency=low
 
   * Rebuilt.
diff -r fec324448e55 -r e13b7117093b MonetDB5/ChangeLog-Archive
--- a/MonetDB5/ChangeLog-Archive        Mon Aug 23 09:48:20 2010 +0200
+++ b/MonetDB5/ChangeLog-Archive        Mon Aug 23 10:41:27 2010 +0200
@@ -1,6 +1,40 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Fri Aug 20 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.5-20100823
+- A bug was fixed where on 32 bit systems (or 64 bit systems using 32 bit
+  OIDs), values where sometimes written as 32 bits but read as 64 bits.
+  This fixes bugs 2644 and 2654.
+
+* Thu Aug 19 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.5-20100823
+- If extensions such as SQL and GEOM are properly installed, they are
+  loaded automatically when mserver5 starts.  This fixes bug 2522.
+
+* Fri Jul 30 2010 Niels Nes <ni...@cwi.nl> - 5.20.5-20100823
+- Fixed bug 2557. There was a bug in the mergetable optimizer which was
+  triggered by multi column (at least 32 columns).
+
+* Wed Jul 28 2010 Martin Kersten <m...@cwi.nl> - 5.20.5-20100823
+- Added missing multiplex version of MAL str.stringlength().
+  This improves performance of SQL length().
+
+* Tue Jul 27 2010 Martin Kersten <m...@cwi.nl> - 5.20.5-20100823
+- Protect dataflow against multi-assignments.
+  This fixes bugs 2626 & 2614.
+
+* Thu Jul 22 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.5-20100823
+- Slight change to Fedora, Debian, Ubuntu installers: the database
+  directory now has the group setuid bit set so that new databases
+  inherit the group ownership (monetdb).
+
+* Thu Jul 15 2010 Stefan Manegold <stefan.maneg...@cwi.nl> - 5.20.5-20100823
+- Restored genuine original mitosis logic by disabling
+  incorrect octopus dominance (even when octopus was not
+  enabled); basically a selective back-port of changesets
+  http://dev.monetdb.org/hg/MonetDB/rev/2a358751a4b6
+  http://dev.monetdb.org/hg/MonetDB/rev/692eff15bea0 from the default
+  branch. This fixes bug 2596.
+
 * Mon Jul 12 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.3-20100713
 - Fixed bug 2597: This bug manifested itself in rank queries in SQL
   but was a bug in the mergetable optimizer.
diff -r fec324448e55 -r e13b7117093b MonetDB5/ChangeLog.Jun2010
--- a/MonetDB5/ChangeLog.Jun2010        Mon Aug 23 09:48:20 2010 +0200
+++ b/MonetDB5/ChangeLog.Jun2010        Mon Aug 23 10:41:27 2010 +0200
@@ -1,37 +1,3 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
-* Fri Aug 20 2010 Sjoerd Mullender <sjo...@acm.org>
-- A bug was fixed where on 32 bit systems (or 64 bit systems using 32 bit
-  OIDs), values where sometimes written as 32 bits but read as 64 bits.
-  This fixes bugs 2644 and 2654.
-
-* Thu Aug 19 2010 Sjoerd Mullender <sjo...@acm.org>
-- If extensions such as SQL and GEOM are properly installed, they are
-  loaded automatically when mserver5 starts.  This fixes bug 2522.
-
-* Fri Jul 30 2010 Niels Nes <ni...@cwi.nl>
-- Fixed bug 2557. There was a bug in the mergetable optimizer which was
-  triggered by multi column (at least 32 columns).
-
-* Wed Jul 28 2010 Martin Kersten <m...@cwi.nl>
-- Added missing multiplex version of MAL str.stringlength().
-  This improves performance of SQL length().
-
-* Tue Jul 27 2010 Martin Kersten <m...@cwi.nl>
-- Protect dataflow against multi-assignments.
-  This fixes bugs 2626 & 2614.
-
-* Thu Jul 22 2010 Sjoerd Mullender <sjo...@acm.org>
-- Slight change to Fedora, Debian, Ubuntu installers: the database
-  directory now has the group setuid bit set so that new databases
-  inherit the group ownership (monetdb).
-
-* Thu Jul 15 2010 Stefan Manegold <stefan.maneg...@cwi.nl>
-- Restored genuine original mitosis logic by disabling
-  incorrect octopus dominance (even when octopus was not
-  enabled); basically a selective back-port of changesets
-  http://dev.monetdb.org/hg/MonetDB/rev/2a358751a4b6
-  http://dev.monetdb.org/hg/MonetDB/rev/692eff15bea0 from the default
-  branch. This fixes bug 2596.
-
diff -r fec324448e55 -r e13b7117093b MonetDB5/MonetDB-server.spec
--- a/MonetDB5/MonetDB-server.spec      Mon Aug 23 09:48:20 2010 +0200
+++ b/MonetDB5/MonetDB-server.spec      Mon Aug 23 10:41:27 2010 +0200
@@ -26,7 +26,7 @@
 Group: Applications/Databases
 License:   MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
 URL: http://monetdb.cwi.nl/
-Source: 
http://dev.monetdb.org/downloads/sources/Jun2010-SP1/MonetDB5-server-%{version}.tar.gz
+Source: 
http://dev.monetdb.org/downloads/sources/Jun2010-SP2/MonetDB5-server-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %{!?_with_raptor: %{!?_without_raptor: %define _with_raptor --with-raptor}}
@@ -214,6 +214,43 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Aug 23 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.5-20100823
+- Rebuilt.
+
+* Fri Aug 20 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.5-20100823
+- A bug was fixed where on 32 bit systems (or 64 bit systems using 32 bit
+  OIDs), values where sometimes written as 32 bits but read as 64 bits.
+  This fixes bugs 2644 and 2654.
+
+* Thu Aug 19 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.5-20100823
+- If extensions such as SQL and GEOM are properly installed, they are
+  loaded automatically when mserver5 starts.  This fixes bug 2522.
+
+* Fri Jul 30 2010 Niels Nes <ni...@cwi.nl> - 5.20.5-20100823
+- Fixed bug 2557. There was a bug in the mergetable optimizer which was
+  triggered by multi column (at least 32 columns).
+
+* Wed Jul 28 2010 Martin Kersten <m...@cwi.nl> - 5.20.5-20100823
+- Added missing multiplex version of MAL str.stringlength().
+  This improves performance of SQL length().
+
+* Tue Jul 27 2010 Martin Kersten <m...@cwi.nl> - 5.20.5-20100823
+- Protect dataflow against multi-assignments.
+  This fixes bugs 2626 & 2614.
+
+* Thu Jul 22 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.5-20100823
+- Slight change to Fedora, Debian, Ubuntu installers: the database
+  directory now has the group setuid bit set so that new databases
+  inherit the group ownership (monetdb).
+
+* Thu Jul 15 2010 Stefan Manegold <stefan.maneg...@cwi.nl> - 5.20.5-20100823
+- Restored genuine original mitosis logic by disabling
+  incorrect octopus dominance (even when octopus was not
+  enabled); basically a selective back-port of changesets
+  http://dev.monetdb.org/hg/MonetDB/rev/2a358751a4b6
+  http://dev.monetdb.org/hg/MonetDB/rev/692eff15bea0 from the default
+  branch. This fixes bug 2596.
+
 * Tue Jul 13 2010 Sjoerd Mullender <sjo...@acm.org> - 5.20.3-20100713
 - Rebuilt.
 
diff -r fec324448e55 -r e13b7117093b MonetDB5/debian/changelog
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to