MonetDB: default - Merge with Jul2015 branch.

[Sjoerd Mullender]

Changeset: 085554e49324 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=085554e49324
Modified Files:
        .hgtags
        MonetDB.spec
        debian/changelog
        libversions
Branch: default
Log Message:

Merge with Jul2015 branch.


diffs (61 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -610,3 +610,6 @@ d1bce2fabbc36a3a3b996b09e55e764a626026a8
 d1dd6e5b7a5acfe14a33070e08c776341996deb2 Jul2015_9
 d1bce2fabbc36a3a3b996b09e55e764a626026a8 Jul2015_SP1_release
 d1dd6e5b7a5acfe14a33070e08c776341996deb2 Jul2015_SP1_release
+2ca94cddcdf52121541eff4bf706b1b7c451f511 Jul2015_11
+d1dd6e5b7a5acfe14a33070e08c776341996deb2 Jul2015_SP1_release
+2ca94cddcdf52121541eff4bf706b1b7c451f511 Jul2015_SP1_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -995,6 +995,12 @@ rm -f %{buildroot}%{_bindir}/Maddlog
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Oct 30 2015 Sjoerd Mullender <sjo...@acm.org> - 11.21.11-20151030
+- Rebuilt.
+- BZ#3828: Schema corruption after several ALTER TABLE statements and
+  server restart
+- BZ#3839: msqldump generates incorrect syntax ON UPDATE (null)
+
 * Mon Oct 26 2015 Sjoerd Mullender <sjo...@acm.org> - 11.21.9-20151026
 - Rebuilt.
 - BZ#3816: Server crashes when trying to convert timestamp to str with
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+monetdb (11.21.11) unstable; urgency=low
+
+  * Rebuilt.
+  * BZ#3828: Schema corruption after several ALTER TABLE statements and
+    server restart
+  * BZ#3839: msqldump generates incorrect syntax ON UPDATE (null)
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Fri, 30 Oct 2015 13:47:30 +0100
+
 monetdb (11.21.9) unstable; urgency=low
 
   * Rebuilt.
diff --git a/libversions b/libversions
--- a/libversions
+++ b/libversions
@@ -36,13 +36,13 @@
 
 # version of the GDK library (subdirectory gdk; also includes
 # common/options and common/utils)
-GDK_VERSION=12:4:0
+GDK_VERSION=12:5:0
 
 # version of the MAPI library (subdirectory clients/mapilib)
 MAPI_VERSION=7:5:0
 
 # version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=19:3:0
+MONETDB5_VERSION=20:0:1
 
 # version of the STREAM library (subdirectory common/stream)
 STREAM_VERSION=7:0:0
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list