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

Merge with Dec2011 branch.


diffs (truncated from 340 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -469,3 +469,5 @@ 6dbadba38a4635b6319f2ba966f5dde6efab037d
 2373eb4ee98b690aa72b86bebf4b2b47c87aa77c Dec2011_5
 6dbadba38a4635b6319f2ba966f5dde6efab037d Dec2011_release
 32665cf67d03011ff1fcc2c8e118370c47e5fae6 Dec2011_release
+d159bb1ba293002773b896353854b14aeb4e5cd1 Dec2011_7
+f47248f30989933b245a4d6f2e31a9e443f1078b Dec2011_SP1_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -27,7 +27,7 @@ Vendor: MonetDB BV <[email protected]>
 Group: Applications/Databases
 License: MPL - http://www.monetdb.org/Legal/MonetDBLicense
 URL: http://www.monetdb.org/
-Source: 
http://dev.monetdb.org/downloads/sources/Dec2011/%{name}-%{version}.tar.bz2
+Source: 
http://dev.monetdb.org/downloads/sources/Dec2011-SP1/%{name}-%{version}.tar.bz2
 
 BuildRequires: bison
 BuildRequires: bzip2-devel
@@ -626,6 +626,52 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Fri Feb 24 2012 Fabian Groffen <[email protected]> - 11.7.7-20120224
+- Rebuilt.
+
+* Wed Feb 22 2012 Sjoerd Mullender <[email protected]> - 11.7.7-20120224
+- buildtools: Fixed some of the package names for Debian/Ubuntu.  Packages for
+  libraries should contain the major number of the library version number.
+  This was not always the case.
+
+* Mon Feb 20 2012 Fabian Groffen <[email protected]> - 11.7.7-20120224
+- java: Fixed bug in DatabaseMetaData.getSchemas() method that caused an SQL
+  error when called with catalog and schema argument.
+
+* Fri Feb 17 2012 Fabian Groffen <[email protected]> - 11.7.7-20120224
+- merovingian: Fixed a bug in the multiplex-funnel where certain clients would 
abort
+  on responses for update queries.
+
+* Fri Feb 17 2012 Sjoerd Mullender <[email protected]> - 11.7.7-20120224
+- sql: Fixed a crash that happened at the end of a database upgrade to the
+  Dec2011 database scheme.  The crash happened during cleanup after the
+  database was upgraded, so it was merely inconvenient.
+
+* Wed Feb 15 2012 Sjoerd Mullender <[email protected]> - 11.7.7-20120224
+- sql: Stripped off implementation-specific parts from error messages before
+  they get presented to the user.
+
+* Tue Feb 14 2012 Fabian Groffen <[email protected]> - 11.7.7-20120224
+- java: Resolved a bug where JDBC and Control connections could terminate
+  abruptly with 'Connection closed' messages
+
+* Thu Feb  9 2012 Sjoerd Mullender <[email protected]> - 11.7.7-20120224
+- monetdb5: Fixed potential crash by dealing better with non-standard types.
+
+* Tue Feb  7 2012 Sjoerd Mullender <[email protected]> - 11.7.7-20120224
+- buildtools: On Debian and Ubuntu, install Python modules in dist-packages 
instead
+  of site-packages.  This fixed bug 2997.
+
+* Mon Jan 30 2012 Fabian Groffen <[email protected]> - 11.7.7-20120224
+- merovingian: Fixed problem where version and mserver properties for monetdbd 
were
+  not always successfully retrieved.  Bug #2982.
+- merovingian: Fixed problem where shutdown of monetdbd would lead to shutting 
down
+  database 'control' which does not exist.  Bug #2983.
+- merovingian: Fixed issue causing (harmless) 'error reading from control 
channel'
+  messages.  Bug #2984.
+- merovingian: Resolved problem where remote start/stop/etc. commands with 
monetdb
+  would report error 'OK'.  Bug #2984.
+
 * Fri Jan 20 2012 Sjoerd Mullender <[email protected]> - 11.7.5-20120120
 - Rebuilt.
 
diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive
--- a/buildtools/ChangeLog-Archive
+++ b/buildtools/ChangeLog-Archive
@@ -1,6 +1,15 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Wed Feb 22 2012 Sjoerd Mullender <[email protected]> - 11.7.7-20120224
+- Fixed some of the package names for Debian/Ubuntu.  Packages for
+  libraries should contain the major number of the library version number.
+  This was not always the case.
+
+* Tue Feb  7 2012 Sjoerd Mullender <[email protected]> - 11.7.7-20120224
+- On Debian and Ubuntu, install Python modules in dist-packages instead
+  of site-packages.  This fixed bug 2997.
+
 * Sat Aug  6 2011 Sjoerd Mullender <[email protected]> - 11.5.1-20110907
 - Fixed Fedora 15 (and presumably later) configuration that uses a tmpfs
   file system for /var/run.  This fixes bug 2850.
diff --git a/buildtools/ChangeLog.Dec2011 b/buildtools/ChangeLog.Dec2011
--- a/buildtools/ChangeLog.Dec2011
+++ b/buildtools/ChangeLog.Dec2011
@@ -1,12 +1,3 @@
 # ChangeLog file for buildtools
 # This file is updated with Maddlog
 
-* Wed Feb 22 2012 Sjoerd Mullender <[email protected]>
-- Fixed some of the package names for Debian/Ubuntu.  Packages for
-  libraries should contain the major number of the library version number.
-  This was not always the case.
-
-* Tue Feb  7 2012 Sjoerd Mullender <[email protected]>
-- On Debian and Ubuntu, install Python modules in dist-packages instead
-  of site-packages.  This fixed bug 2997.
-
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,79 @@
+monetdb (11.7.7-20120224) unstable; urgency=low
+
+  * Rebuilt.
+
+ -- Fabian Groffen <[email protected]>  Fri, 24 Feb 2012 13:06:00 +0100
+
+monetdb (11.7.7-20120224) unstable; urgency=low
+
+  * buildtools: Fixed some of the package names for Debian/Ubuntu.  Packages 
for
+    libraries should contain the major number of the library version number.
+    This was not always the case.
+
+ -- Sjoerd Mullender <[email protected]>  Wed, 22 Feb 2012 13:05:59 +0100
+
+monetdb (11.7.7-20120224) unstable; urgency=low
+
+  * java: Fixed bug in DatabaseMetaData.getSchemas() method that caused an SQL
+    error when called with catalog and schema argument.
+
+ -- Fabian Groffen <[email protected]>  Mon, 20 Feb 2012 13:05:59 +0100
+
+monetdb (11.7.7-20120224) unstable; urgency=low
+
+  * merovingian: Fixed a bug in the multiplex-funnel where certain clients 
would abort
+    on responses for update queries.
+
+ -- Fabian Groffen <[email protected]>  Fri, 17 Feb 2012 13:05:59 +0100
+
+monetdb (11.7.7-20120224) unstable; urgency=low
+
+  * sql: Fixed a crash that happened at the end of a database upgrade to the
+    Dec2011 database scheme.  The crash happened during cleanup after the
+    database was upgraded, so it was merely inconvenient.
+
+ -- Sjoerd Mullender <[email protected]>  Fri, 17 Feb 2012 13:05:59 +0100
+
+monetdb (11.7.7-20120224) unstable; urgency=low
+
+  * sql: Stripped off implementation-specific parts from error messages before
+    they get presented to the user.
+
+ -- Sjoerd Mullender <[email protected]>  Wed, 15 Feb 2012 13:05:59 +0100
+
+monetdb (11.7.7-20120224) unstable; urgency=low
+
+  * java: Resolved a bug where JDBC and Control connections could terminate
+    abruptly with 'Connection closed' messages
+
+ -- Fabian Groffen <[email protected]>  Tue, 14 Feb 2012 13:05:59 +0100
+
+monetdb (11.7.7-20120224) unstable; urgency=low
+
+  * monetdb5: Fixed potential crash by dealing better with non-standard types.
+
+ -- Sjoerd Mullender <[email protected]>  Thu, 9 Feb 2012 13:05:59 +0100
+
+monetdb (11.7.7-20120224) unstable; urgency=low
+
+  * buildtools: On Debian and Ubuntu, install Python modules in dist-packages 
instead
+    of site-packages.  This fixed bug 2997.
+
+ -- Sjoerd Mullender <[email protected]>  Tue, 7 Feb 2012 13:05:59 +0100
+
+monetdb (11.7.7-20120224) unstable; urgency=low
+
+  * merovingian: Fixed problem where version and mserver properties for 
monetdbd were
+    not always successfully retrieved.  Bug #2982.
+  * merovingian: Fixed problem where shutdown of monetdbd would lead to 
shutting down
+    database 'control' which does not exist.  Bug #2983.
+  * merovingian: Fixed issue causing (harmless) 'error reading from control 
channel'
+    messages.  Bug #2984.
+  * merovingian: Resolved problem where remote start/stop/etc. commands with 
monetdb
+    would report error 'OK'.  Bug #2984.
+
+ -- Fabian Groffen <[email protected]>  Mon, 30 Jan 2012 13:05:59 +0100
+
 monetdb (11.7.5-20120120) unstable; urgency=low
 
   * Rebuilt.
diff --git a/java/ChangeLog-Archive b/java/ChangeLog-Archive
--- a/java/ChangeLog-Archive
+++ b/java/ChangeLog-Archive
@@ -1,6 +1,14 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Mon Feb 20 2012 Fabian Groffen <[email protected]> - 11.7.7-20120224
+- Fixed bug in DatabaseMetaData.getSchemas() method that caused an SQL
+  error when called with catalog and schema argument.
+
+* Tue Feb 14 2012 Fabian Groffen <[email protected]> - 11.7.7-20120224
+- Resolved a bug where JDBC and Control connections could terminate
+  abruptly with 'Connection closed' messages
+
 * Mon Jan  2 2012 Fabian Groffen <[email protected]> - 11.7.1-20120111
 - Implemented getMetaData() method of PreparedStatement.
 
diff --git a/java/ChangeLog.Dec2011 b/java/ChangeLog.Dec2011
--- a/java/ChangeLog.Dec2011
+++ b/java/ChangeLog.Dec2011
@@ -1,11 +1,3 @@
 # ChangeLog file for java
 # This file is updated with Maddlog
 
-* Mon Feb 20 2012 Fabian Groffen <[email protected]>
-- Fixed bug in DatabaseMetaData.getSchemas() method that caused an SQL
-  error when called with catalog and schema argument.
-
-* Tue Feb 14 2012 Fabian Groffen <[email protected]>
-- Resolved a bug where JDBC and Control connections could terminate
-  abruptly with 'Connection closed' messages
-
diff --git a/libversions b/libversions
--- a/libversions
+++ b/libversions
@@ -41,7 +41,7 @@ GDK_VERSION=4:4:0
 MAPI_VERSION=5:0:0
 
 # version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=10:2:0
+MONETDB5_VERSION=10:3:0
 
 # version of the STREAM library (subdirectory common/stream)
 STREAM_VERSION=3:0:0
diff --git a/monetdb5/ChangeLog-Archive b/monetdb5/ChangeLog-Archive
--- a/monetdb5/ChangeLog-Archive
+++ b/monetdb5/ChangeLog-Archive
@@ -1,6 +1,9 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Thu Feb  9 2012 Sjoerd Mullender <[email protected]> - 11.7.7-20120224
+- Fixed potential crash by dealing better with non-standard types.
+
 * Mon Jan 16 2012 Sjoerd Mullender <[email protected]> - 11.7.3-20120117
 - A couple of memory leaks have been plugged.
 
diff --git a/monetdb5/ChangeLog.Dec2011 b/monetdb5/ChangeLog.Dec2011
--- a/monetdb5/ChangeLog.Dec2011
+++ b/monetdb5/ChangeLog.Dec2011
@@ -1,6 +1,3 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
-* Thu Feb  9 2012 Sjoerd Mullender <[email protected]>
-- Fixed potential crash by dealing better with non-standard types.
-
diff --git a/sql/ChangeLog-Archive b/sql/ChangeLog-Archive
--- a/sql/ChangeLog-Archive
+++ b/sql/ChangeLog-Archive
@@ -1,6 +1,15 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Fri Feb 17 2012 Sjoerd Mullender <[email protected]> - 11.7.7-20120224
+- Fixed a crash that happened at the end of a database upgrade to the
+  Dec2011 database scheme.  The crash happened during cleanup after the
+  database was upgraded, so it was merely inconvenient.
+
+* Wed Feb 15 2012 Sjoerd Mullender <[email protected]> - 11.7.7-20120224
+- Stripped off implementation-specific parts from error messages before
+  they get presented to the user.
+
 * Thu Nov  3 2011 Sjoerd Mullender <[email protected]> - 11.7.1-20120111
 - mclient: The csv output format can now also be of the form csv=c and
   csv+c where c is the column separator.  The form with csv+ produces
diff --git a/sql/ChangeLog.Dec2011 b/sql/ChangeLog.Dec2011
--- a/sql/ChangeLog.Dec2011
+++ b/sql/ChangeLog.Dec2011
@@ -1,12 +1,3 @@
 # ChangeLog file for sql
 # This file is updated with Maddlog
 
-* Fri Feb 17 2012 Sjoerd Mullender <[email protected]>
-- Fixed a crash that happened at the end of a database upgrade to the
-  Dec2011 database scheme.  The crash happened during cleanup after the
-  database was upgraded, so it was merely inconvenient.
-
-* Wed Feb 15 2012 Sjoerd Mullender <[email protected]>
-- Stripped off implementation-specific parts from error messages before
-  they get presented to the user.
-
diff --git a/tools/merovingian/ChangeLog-Archive 
b/tools/merovingian/ChangeLog-Archive
--- a/tools/merovingian/ChangeLog-Archive
+++ b/tools/merovingian/ChangeLog-Archive
@@ -1,6 +1,20 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to