Changeset: 4efa16395b04 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4efa16395b04
Modified Files:
.hgtags
MonetDB.spec
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
debian/changelog
gdk/libbat.rc
libversions
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: default
Log Message:
Merge heads.
diffs (71 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -637,3 +637,6 @@ 731a25ce40993c0d73ee4fcefb286b9a0a2e0981
f16cdfed96bdc0f3324f8ced85a8b74c67f4dc9b Jun2016_11
731a25ce40993c0d73ee4fcefb286b9a0a2e0981 Jun2016_SP2_release
f16cdfed96bdc0f3324f8ced85a8b74c67f4dc9b Jun2016_SP2_release
+293b452cd1e5964d820f7d6c538e06507e575d88 Jun2016_13
+f16cdfed96bdc0f3324f8ced85a8b74c67f4dc9b Jun2016_SP2_release
+293b452cd1e5964d820f7d6c538e06507e575d88 Jun2016_SP2_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -899,6 +899,17 @@ rm -f %{buildroot}%{_bindir}/Maddlog
%postun -p /sbin/ldconfig
%changelog
+* Fri Oct 07 2016 Sjoerd Mullender <[email protected]> - 11.23.13-20161007
+- Rebuilt.
+- BZ#4058: Server crashes with a particular conditional query
+- BZ#4064: Assertion: column not found
+- BZ#4067: Relevant column name not printed when a CSV parsing error
+ occurs
+- BZ#4070: Extra condition in join predicate of explicit join produces
+ wrong MAL code
+- BZ#4074: Cannot use prepared statements when caching disabled
+- BZ#6065: CTE with row number and union fails within MAL
+
* Wed Sep 28 2016 Sjoerd Mullender <[email protected]> - 11.23.11-20160928
- Rebuilt.
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+monetdb (11.23.13) unstable; urgency=low
+
+ * Rebuilt.
+ * BZ#4058: Server crashes with a particular conditional query
+ * BZ#4064: Assertion: column not found
+ * BZ#4067: Relevant column name not printed when a CSV parsing error
+ occurs
+ * BZ#4070: Extra condition in join predicate of explicit join produces
+ wrong MAL code
+ * BZ#4074: Cannot use prepared statements when caching disabled
+ * BZ#6065: CTE with row number and union fails within MAL
+
+ -- Sjoerd Mullender <[email protected]> Fri, 07 Oct 2016 11:01:07 +0200
+
monetdb (11.23.11) 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=13:5:0
+GDK_VERSION=13:6:0
# 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=21:5:0
+MONETDB5_VERSION=21:6:0
# version of the STREAM library (subdirectory common/stream)
STREAM_VERSION=8:3:0
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
