Changeset: a5d26b279988 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a5d26b279988
Modified Files:
.hgtags
MonetDB.spec
debian/changelog
gdk/ChangeLog-Archive
gdk/ChangeLog.Dec2016
libversions
monetdb5/ChangeLog-Archive
monetdb5/ChangeLog.Dec2016
sql/ChangeLog-Archive
sql/ChangeLog.Dec2016
Branch: default
Log Message:
Merge with Dec2016 branch.
diffs (161 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -664,3 +664,6 @@ 94a35822a8d9dfc6458a2353168e37a21b16ea29
8dcbdc30cd49d1d03e3a21b37671d567d84943ae Dec2016_SP3_release
07824a1c7beb75308b813378af33c243f1c2f511 Dec2016_17
07824a1c7beb75308b813378af33c243f1c2f511 Dec2016_SP4_release
+c57454c6c6f6e77fbbdf70de32a7cc845b67d1dd Dec2016_19
+07824a1c7beb75308b813378af33c243f1c2f511 Dec2016_SP4_release
+c57454c6c6f6e77fbbdf70de32a7cc845b67d1dd Dec2016_SP4_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -953,6 +953,21 @@ rm -f %{buildroot}%{_bindir}/Maddlog
%postun -p /sbin/ldconfig
%changelog
+* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418
+- Rebuilt.
+- BZ#6259: crash on select query from sqlitelogictests
+
+* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418
+- gdk: A potential deadlock was fixed in order index creation.
+- gdk: A bug that could happen during recovery of the write-ahead log (WAL)
+ was fixed. See changeset 98ad79c555cc for details.
+
+* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418
+- monetdb5: Some memory leaks were plugged.
+
+* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418
+- sql: Some memory leaks were plugged.
+
* Tue Apr 11 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.17-20170411
- Rebuilt.
- BZ#6110: cast of a SQL boolean value to a string or clob or (var)char
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+monetdb (11.25.19) unstable; urgency=low
+
+ * Rebuilt.
+ * BZ#6259: crash on select query from sqlitelogictests
+
+ -- Sjoerd Mullender <sjo...@acm.org> Tue, 18 Apr 2017 10:14:40 +0200
+
+monetdb (11.25.19) unstable; urgency=low
+
+ * gdk: A potential deadlock was fixed in order index creation.
+ * gdk: A bug that could happen during recovery of the write-ahead log (WAL)
+ was fixed. See changeset 98ad79c555cc for details.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Tue, 18 Apr 2017 10:14:40 +0200
+
+monetdb (11.25.19) unstable; urgency=low
+
+ * monetdb5: Some memory leaks were plugged.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Tue, 18 Apr 2017 10:14:40 +0200
+
+monetdb (11.25.19) unstable; urgency=low
+
+ * sql: Some memory leaks were plugged.
+
+ -- Sjoerd Mullender <sjo...@acm.org> Tue, 18 Apr 2017 10:14:40 +0200
+
monetdb (11.25.17) 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,11 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418
+- A potential deadlock was fixed in order index creation.
+- A bug that could happen during recovery of the write-ahead log (WAL)
+ was fixed. See changeset 98ad79c555cc for details.
+
* Tue Feb 28 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.11-20170313
- Fixed a bug when appending string bats that are fully duplicate
eliminated. It could happend that the to-be-appended bat had an empty
diff --git a/gdk/ChangeLog.Dec2016 b/gdk/ChangeLog.Dec2016
--- a/gdk/ChangeLog.Dec2016
+++ b/gdk/ChangeLog.Dec2016
@@ -1,8 +1,3 @@
# ChangeLog file for MonetDB
# This file is updated with Maddlog
-* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org>
-- A potential deadlock was fixed in order index creation.
-- A bug that could happen during recovery of the write-ahead log (WAL)
- was fixed. See changeset 98ad79c555cc for details.
-
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=14:5:1
+GDK_VERSION=14:6:1
# version of the MAPI library (subdirectory clients/mapilib)
MAPI_VERSION=8:1:0
# version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=22:4:1
+MONETDB5_VERSION=22:5: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,9 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418
+- Some memory leaks were plugged.
+
* Wed Aug 3 2016 Sjoerd Mullender <sjo...@acm.org> - 11.25.1-20161214
- Removed the zorder module with functions zorder.encode, zorder.decode_x
and zorder.decode_y.
diff --git a/monetdb5/ChangeLog.Dec2016 b/monetdb5/ChangeLog.Dec2016
--- a/monetdb5/ChangeLog.Dec2016
+++ b/monetdb5/ChangeLog.Dec2016
@@ -1,6 +1,3 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
-* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org>
-- Some memory leaks were plugged.
-
diff --git a/sql/ChangeLog-Archive b/sql/ChangeLog-Archive
--- a/sql/ChangeLog-Archive
+++ b/sql/ChangeLog-Archive
@@ -1,6 +1,9 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418
+- Some memory leaks were plugged.
+
* Tue Apr 11 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.17-20170411
- Upgrade code was added for an old change in the sys.settimeout function.
- A bug was fixed with the automatic "vacuum" operation on system tables.
diff --git a/sql/ChangeLog.Dec2016 b/sql/ChangeLog.Dec2016
--- a/sql/ChangeLog.Dec2016
+++ b/sql/ChangeLog.Dec2016
@@ -1,6 +1,3 @@
# ChangeLog file for sql
# This file is updated with Maddlog
-* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org>
-- Some memory leaks were plugged.
-
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
