Changeset: a6a01adf59a8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a6a01adf59a8
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
clients/python2/setup.py
clients/python3/setup.py
configure.ag
debian/changelog
gdk/libbat.rc
libversions
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: default
Log Message:
Merge with default
diffs (63 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -553,3 +553,6 @@ 493536e9b1f592ef08778febca455c329945cd91
b0ebdc497497292f4a6cb340da3e1340e3407466 Jan2014_7
493536e9b1f592ef08778febca455c329945cd91 Jan2014_release
fb702cba0210295b29825b095ed87d92b6645434 Jan2014_release
+ce19933aa1cf72076fd33ddd485ea0303f87753f Jan2014_9
+fb702cba0210295b29825b095ed87d92b6645434 Jan2014_release
+14baa1e3a827c26932ec5d853feca28eacd70009 Jan2014_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -798,6 +798,10 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetD
rm -fr $RPM_BUILD_ROOT
%changelog
+* Thu Feb 13 2014 Sjoerd Mullender <[email protected]> - 11.17.9-20140213
+- Rebuilt.
+- BZ#3435: INDEX prevents JOIN from discovering matches
+
* Fri Feb 07 2014 Sjoerd Mullender <[email protected]> - 11.17.7-20140207
- Rebuilt.
- BZ#3436: COPY INTO from file containing leading Byte Order Mark (BOM)
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+monetdb (11.17.9-20140213) unstable; urgency=low
+
+ * Rebuilt.
+
+ -- Sjoerd Mullender <[email protected]> Thu, 13 Feb 2014 12:40:16 +0100
+
+monetdb (11.17.9-20140213) unstable; urgency=low
+
+ * Rebuilt.
+ * BZ#3435: INDEX prevents JOIN from discovering matches
+
+ -- Sjoerd Mullender <[email protected]> Thu, 13 Feb 2014 12:40:14 +0100
+
monetdb (11.17.7-20140207) 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=10:3:0
+GDK_VERSION=10:4:0
# version of the MAPI library (subdirectory clients/mapilib)
MAPI_VERSION=6:5:0
# version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=16:3:0
+MONETDB5_VERSION=16:4:0
# version of the STREAM library (subdirectory common/stream)
STREAM_VERSION=5:1:0
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
