Changeset: 0f4eb8a8afe0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0f4eb8a8afe0
Modified Files:
.hgtags
MonetDB.spec
debian/changelog
libversions
monetdb5/ChangeLog-Archive
monetdb5/ChangeLog.Dec2016
Branch: wlcr
Log Message:
Merge with default
diffs (90 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -668,3 +668,6 @@ c57454c6c6f6e77fbbdf70de32a7cc845b67d1dd
07824a1c7beb75308b813378af33c243f1c2f511 Dec2016_SP4_release
c57454c6c6f6e77fbbdf70de32a7cc845b67d1dd Dec2016_SP4_release
54a8c9d99dc3621a02579db0c59309781caceb54 Jul2017_root
+05f4e62bc67911a25f19be7fe742009ab1ee41c7 Dec2016_21
+c57454c6c6f6e77fbbdf70de32a7cc845b67d1dd Dec2016_SP4_release
+05f4e62bc67911a25f19be7fe742009ab1ee41c7 Dec2016_SP4_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -953,6 +953,16 @@ rm -f %{buildroot}%{_bindir}/Maddlog
%postun -p /sbin/ldconfig
%changelog
+* Tue Apr 25 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.21-20170425
+- Rebuilt.
+- BZ#6260: Sqlitelogictest crash
+- BZ#6288: Function cannot find column in merge table
+- BZ#6295: msqldump writes unescaped timestamp values when using inserts
+
+* Wed Apr 19 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.21-20170425
+- monetdb5: Fixed a bug causing a crash during cleanup when mserver5 is stopped
+ with monetdb stop database.
+
* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418
- Rebuilt.
- BZ#6259: crash on select query from sqlitelogictests
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+monetdb (11.25.21) unstable; urgency=low
+
+ * Rebuilt.
+ * BZ#6260: Sqlitelogictest crash
+ * BZ#6288: Function cannot find column in merge table
+ * BZ#6295: msqldump writes unescaped timestamp values when using inserts
+
+ -- Sjoerd Mullender <sjo...@acm.org> Tue, 25 Apr 2017 11:05:40 +0200
+
+monetdb (11.25.21) unstable; urgency=low
+
+ * monetdb5: Fixed a bug causing a crash during cleanup when mserver5 is
stopped
+ with monetdb stop database.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Wed, 19 Apr 2017 11:05:40 +0200
+
monetdb (11.25.19) unstable; urgency=low
* Rebuilt.
diff --git a/libversions b/libversions
--- a/libversions
+++ b/libversions
@@ -42,7 +42,7 @@ GDK_VERSION=14:6:1
MAPI_VERSION=8:1:0
# version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=22:5:1
+MONETDB5_VERSION=22:6:1
# version of the STREAM library (subdirectory common/stream)
STREAM_VERSION=9:0:1
diff --git a/monetdb5/ChangeLog-Archive b/monetdb5/ChangeLog-Archive
--- a/monetdb5/ChangeLog-Archive
+++ b/monetdb5/ChangeLog-Archive
@@ -1,6 +1,10 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Wed Apr 19 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.21-20170425
+- Fixed a bug causing a crash during cleanup when mserver5 is stopped
+ with monetdb stop database.
+
* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418
- Some memory leaks were plugged.
diff --git a/monetdb5/ChangeLog.Dec2016 b/monetdb5/ChangeLog.Dec2016
--- a/monetdb5/ChangeLog.Dec2016
+++ b/monetdb5/ChangeLog.Dec2016
@@ -1,7 +1,3 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
-* Wed Apr 19 2017 Sjoerd Mullender <sjo...@acm.org>
-- Fixed a bug causing a crash during cleanup when mserver5 is stopped
- with monetdb stop database.
-
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
