Changeset: 4a8da1bb2de1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4a8da1bb2de1
Modified Files:
        .hgtags
        MonetDB.spec
Branch: Aug2011
Log Message:

Merge with Apr2011 branch.


diffs (truncated from 379 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -444,3 +444,5 @@
 1833949cae477d8f1efde8caea6608c04f67ad6d Apr2011_3
 c8a6189f95ae3d7cfb8d14f3b002c1077a4c437c Apr2011_SP1_release
 b540445f1e7aa333708963a7afb46acd1914fdb3 Aug2011_root
+dbf80a87be87b463e6603221e0ed6e31d85d94c3 Apr2011_5
+bb8536db427b60b0226bbdec8dbfddfa7a26f37f Apr2011_SP2_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -27,7 +27,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/Apr2011-SP1/%{name}-%{version}.tar.bz2
+Source: 
http://dev.monetdb.org/downloads/sources/Apr2011-SP2/%{name}-%{version}.tar.bz2
 
 BuildRequires: bison
 BuildRequires: bzip2-devel
@@ -587,6 +587,59 @@
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jul 20 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.5-20110720
+- Rebuilt.
+
+* Tue Jul 19 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.5-20110720
+- sql: Fixed regression where the superuser password could no longer be
+  changed, bug #2844
+
+* Wed Jul 13 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.5-20110720
+- buildtools: We can now build RPMs on CentOS 6.0.  Since there is no geos 
library
+  on CentOS, we do not support the geom modules there.
+
+* Sat Jul  9 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.5-20110720
+- gdk: Fixed a problem where appending string BATs could cause enormous growth
+  of the string heap.  This fixes bug 2820.
+
+* Fri Jul  8 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.5-20110720
+- java: Return false from Statement.getMoreResults() instead of a
+  NullPointerException when no query has been performed on the Statement
+  yet, bug #2833
+
+* Fri Jul  1 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.5-20110720
+- clients: Fix stethoscope's mod.fcn filter when using multiple targets, bug 
#2827
+
+* Wed Jun 29 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.5-20110720
+- buildtools: We can now also build on Fedora 15.  This required some very 
minor
+  changes.
+- buildtools: Changed configure check for OpenSSL so that we can also build on 
CentOS
+  5.6.  We now no longer demand that OpenSSL is at least version 0.9.8f,
+  but instead we require that the hash functions we need are supported.
+
+* Wed Jun 29 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.5-20110720
+- clients: The separate Python distribution now uses the same version number as
+  the main package.
+
+* Wed Jun 29 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.5-20110720
+- gdk: Fixes to memory detection on FreeBSD.
+
+* Wed Jun 29 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.5-20110720
+- sql: Fixed incorrect insert counts.
+- sql: Fixed bug 2823: MAL exeption on SQL query with subquery in the where
+  part.
+- sql: Redirect error from create scripts back to the first client.  This
+  fixes bug 2813.
+- sql: Added joinidx based semijoin; push join through union (using
+  joinidx).
+- sql: Fixed pushing select down.
+
+* Mon Jun  6 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.5-20110720
+- java: Fixed read-only interpretation.  Connection.isReadOnly now always
+  returns false, setReadOnly now generates a warning when called with
+  true.  Partly from bug #2818
+- java: Allow readonly to be set when autocommit is disabled as well.  Bug 
#2818
+
 * Tue May 17 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.3-20110517
 - Rebuilt.
 
diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive
--- a/buildtools/ChangeLog-Archive
+++ b/buildtools/ChangeLog-Archive
@@ -1,6 +1,17 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Wed Jul 13 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.5-20110720
+- We can now build RPMs on CentOS 6.0.  Since there is no geos library
+  on CentOS, we do not support the geom modules there.
+
+* Wed Jun 29 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.5-20110720
+- We can now also build on Fedora 15.  This required some very minor
+  changes.
+- Changed configure check for OpenSSL so that we can also build on CentOS
+  5.6.  We now no longer demand that OpenSSL is at least version 0.9.8f,
+  but instead we require that the hash functions we need are supported.
+
 * Thu Jul 22 2010 Sjoerd Mullender <sjo...@acm.org> - 1.0-20100823
 - Changed Maddlog to search up the directory tree to find a ChangeLog
   file.
diff --git a/buildtools/ChangeLog.Apr2011 b/buildtools/ChangeLog.Apr2011
--- a/buildtools/ChangeLog.Apr2011
+++ b/buildtools/ChangeLog.Apr2011
@@ -1,14 +1,3 @@
 # ChangeLog file for buildtools
 # This file is updated with Maddlog
 
-* Wed Jul 13 2011 Sjoerd Mullender <sjo...@acm.org>
-- We can now build RPMs on CentOS 6.0.  Since there is no geos library
-  on CentOS, we do not support the geom modules there.
-
-* Wed Jun 29 2011 Sjoerd Mullender <sjo...@acm.org>
-- We can now also build on Fedora 15.  This required some very minor
-  changes.
-- Changed configure check for OpenSSL so that we can also build on CentOS
-  5.6.  We now no longer demand that OpenSSL is at least version 0.9.8f,
-  but instead we require that the hash functions we need are supported.
-
diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive
--- a/clients/ChangeLog-Archive
+++ b/clients/ChangeLog-Archive
@@ -1,6 +1,13 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Fri Jul  1 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.5-20110720
+- Fix stethoscope's mod.fcn filter when using multiple targets, bug #2827
+
+* Wed Jun 29 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.5-20110720
+- The separate Python distribution now uses the same version number as
+  the main package.
+
 * Tue Apr  5 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.1-20110414
 - Plugged a small memory leak occurring upon redirects by the server
   (e.g. via monetdbd)
diff --git a/clients/ChangeLog.Apr2011 b/clients/ChangeLog.Apr2011
--- a/clients/ChangeLog.Apr2011
+++ b/clients/ChangeLog.Apr2011
@@ -1,10 +1,3 @@
 # ChangeLog file for clients
 # This file is updated with Maddlog
 
-* Fri Jul  1 2011 Fabian Groffen <fab...@cwi.nl>
-- Fix stethoscope's mod.fcn filter when using multiple targets, bug #2827
-
-* Wed Jun 29 2011 Sjoerd Mullender <sjo...@acm.org>
-- The separate Python distribution now uses the same version number as
-  the main package.
-
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,89 @@
+monetdb (11.3.5-20110720) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Wed, 20 Jul 2011 12:43:02 +0200
+
+monetdb (11.3.5-20110720) unstable; urgency=low
+
+  * sql: Fixed regression where the superuser password could no longer be
+    changed, bug #2844
+
+ -- Fabian Groffen <fab...@cwi.nl>  Tue, 19 Jul 2011 12:43:02 +0200
+
+monetdb (11.3.5-20110720) unstable; urgency=low
+
+  * buildtools: We can now build RPMs on CentOS 6.0.  Since there is no geos 
library
+    on CentOS, we do not support the geom modules there.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Wed, 13 Jul 2011 12:43:02 +0200
+
+monetdb (11.3.5-20110720) unstable; urgency=low
+
+  * gdk: Fixed a problem where appending string BATs could cause enormous 
growth
+    of the string heap.  This fixes bug 2820.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Sat, 9 Jul 2011 12:43:02 +0200
+
+monetdb (11.3.5-20110720) unstable; urgency=low
+
+  * java: Return false from Statement.getMoreResults() instead of a
+    NullPointerException when no query has been performed on the Statement
+    yet, bug #2833
+
+ -- Fabian Groffen <fab...@cwi.nl>  Fri, 8 Jul 2011 12:43:02 +0200
+
+monetdb (11.3.5-20110720) unstable; urgency=low
+
+  * clients: Fix stethoscope's mod.fcn filter when using multiple targets, bug 
#2827
+
+ -- Fabian Groffen <fab...@cwi.nl>  Fri, 1 Jul 2011 12:43:02 +0200
+
+monetdb (11.3.5-20110720) unstable; urgency=low
+
+  * buildtools: We can now also build on Fedora 15.  This required some very 
minor
+    changes.
+  * buildtools: Changed configure check for OpenSSL so that we can also build 
on CentOS
+    5.6.  We now no longer demand that OpenSSL is at least version 0.9.8f,
+    but instead we require that the hash functions we need are supported.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Wed, 29 Jun 2011 12:43:02 +0200
+
+monetdb (11.3.5-20110720) unstable; urgency=low
+
+  * clients: The separate Python distribution now uses the same version number 
as
+    the main package.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Wed, 29 Jun 2011 12:43:02 +0200
+
+monetdb (11.3.5-20110720) unstable; urgency=low
+
+  * gdk: Fixes to memory detection on FreeBSD.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Wed, 29 Jun 2011 12:43:02 +0200
+
+monetdb (11.3.5-20110720) unstable; urgency=low
+
+  * sql: Fixed incorrect insert counts.
+  * sql: Fixed bug 2823: MAL exeption on SQL query with subquery in the where
+    part.
+  * sql: Redirect error from create scripts back to the first client.  This
+    fixes bug 2813.
+  * sql: Added joinidx based semijoin; push join through union (using
+    joinidx).
+  * sql: Fixed pushing select down.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Wed, 29 Jun 2011 12:43:02 +0200
+
+monetdb (11.3.5-20110720) unstable; urgency=low
+
+  * java: Fixed read-only interpretation.  Connection.isReadOnly now always
+    returns false, setReadOnly now generates a warning when called with
+    true.  Partly from bug #2818
+  * java: Allow readonly to be set when autocommit is disabled as well.  Bug 
#2818
+
+ -- Fabian Groffen <fab...@cwi.nl>  Mon, 6 Jun 2011 12:43:02 +0200
+
 monetdb (11.3.3-20110517) unstable; urgency=low
 
   * Rebuilt.
diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive
--- a/gdk/ChangeLog-Archive
+++ b/gdk/ChangeLog-Archive
@@ -1,6 +1,13 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Sat Jul  9 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.5-20110720
+- Fixed a problem where appending string BATs could cause enormous growth
+  of the string heap.  This fixes bug 2820.
+
+* Wed Jun 29 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.5-20110720
+- Fixes to memory detection on FreeBSD.
+
 * Fri May 13 2011 Sjoerd Mullender <sjo...@acm.org> - 11.3.3-20110517
 - Fixed a bug where large files (> 2GB) didn't always get deleted on
   Windows.
diff --git a/gdk/ChangeLog.Apr2011 b/gdk/ChangeLog.Apr2011
--- a/gdk/ChangeLog.Apr2011
+++ b/gdk/ChangeLog.Apr2011
@@ -1,10 +1,3 @@
 # ChangeLog file for MonetDB
 # This file is updated with Maddlog
 
-* Sat Jul  9 2011 Sjoerd Mullender <sjo...@acm.org>
-- Fixed a problem where appending string BATs could cause enormous growth
-  of the string heap.  This fixes bug 2820.
-
-* Wed Jun 29 2011 Sjoerd Mullender <sjo...@acm.org>
-- Fixes to memory detection on FreeBSD.
-
diff --git a/java/ChangeLog-Archive b/java/ChangeLog-Archive
--- a/java/ChangeLog-Archive
+++ b/java/ChangeLog-Archive
@@ -1,6 +1,17 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Fri Jul  8 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.5-20110720
+- Return false from Statement.getMoreResults() instead of a
+  NullPointerException when no query has been performed on the Statement
+  yet, bug #2833
+
+* Mon Jun  6 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.5-20110720
+- Fixed read-only interpretation.  Connection.isReadOnly now always
+  returns false, setReadOnly now generates a warning when called with
+  true.  Partly from bug #2818
+- Allow readonly to be set when autocommit is disabled as well.  Bug #2818
+
 * Wed May 11 2011 Fabian Groffen <fab...@cwi.nl> - 11.3.3-20110517
 - Insertion via PreparedStatement and retrieval via ResultSet of timestamp
   and time fields with and without timezones was improved to better
diff --git a/java/ChangeLog.Apr2011 b/java/ChangeLog.Apr2011
--- a/java/ChangeLog.Apr2011
+++ b/java/ChangeLog.Apr2011
@@ -1,14 +1,3 @@
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to