Changeset: e646e03cbafc for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e646e03cbafc 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 buildtools/ChangeLog-Archive buildtools/ChangeLog.Jan2014 clients/ChangeLog-Archive clients/ChangeLog.Jan2014 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: transaction-replication Log Message:
Merge with default diffs (209 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -562,3 +562,5 @@ fa6872e2a8cf8bb3b4fb25a3b356946316f52a6b 45d2af6f6cca3478319a11b5ddae69ecd9f19943 Jan2014_13 fa6872e2a8cf8bb3b4fb25a3b356946316f52a6b Jan2014_SP1_release 242fe4b4960f54c339f7a6fb79aedd8f3b5e217a Jan2014_SP1_release +c91c4d792dee1074ce6f489e94ce4bfc480edfb3 Jan2014_15 +13e1b24f442791f5ab790fa77453d3bd4e88a9c8 Jan2014_SP2_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -45,7 +45,7 @@ Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases License: MPL - http://www.monetdb.org/Legal/MonetDBLicense URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Jan2014-SP1/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Jan2014-SP2/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -800,6 +800,45 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetD rm -fr $RPM_BUILD_ROOT %changelog +* Thu May 08 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.15-20140508 +- Rebuilt. +- BZ#3424: numeric values at the front of strings determines whether + CAST works successfully +- BZ#3439: Python driver drops milliseconds from timestamps +- BZ#3446: SET READ ONLY forgets previous changes +- BZ#3455: String columns unusable from 64-bit .NET via ODBC +- BZ#3456: Insert fails +- BZ#3457: When kernel of remote client crashes, the connection remains + established on server side +- BZ#3458: mserver5 crash on SQL: SELECT COUNT(*) FROM SYS.TABLES HAVING + COUNT(*) > 0 +- BZ#3461: mserver5 crash on SQL: SELECT * FROM SYS.ARGS WHERE FUNC_ID + NOT IN (SELECT ID FROM SYS.FUNCTIONS) OR FUNC_ID NOT IN (SELECT * + FROM SYS.FUNCTIONS) +- BZ#3462: Invalid SQL (IN with subquery which returns multiple columns) + is accepted +- BZ#3463: Crash on SELECT with SERIAL aggregation and GROUP BY column + alias's +- BZ#3468: Local temporary table persists across sessions +- BZ#3469: Absolute network paths considered invalid for COPY INTO + ... FROM statement. +- BZ#3473: Various memory leaks in SQL compilation +- BZ#3477: ODBC driver raises "unexpected end of input" for prepared + string parameter from .NET application +- BZ#3481: Cannot run multiple COPY INTO statements in one 's'-command + +* Wed Apr 30 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.15-20140508 +- buildtools: Lots of minor fixes were made for potential defects found by Coverity + Scan. + +* Tue Apr 1 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.15-20140508 +- clients: ODBC: Implemented {call procedure-name(...)} escape. The version + {?=call ...} is not implemented. + +* Mon Mar 24 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.15-20140508 +- buildtools: On Windows we now build the geom module against version 3.4.2 of the + geos library. + * Thu Mar 06 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.13-20140306 - Rebuilt. - BZ#3452: ODBC driver build fails on Mac OS X due to a conflicting diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive --- a/buildtools/ChangeLog-Archive +++ b/buildtools/ChangeLog-Archive @@ -1,6 +1,14 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Wed Apr 30 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.15-20140508 +- Lots of minor fixes were made for potential defects found by Coverity + Scan. + +* Mon Mar 24 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.15-20140508 +- On Windows we now build the geom module against version 3.4.2 of the + geos library. + * Fri Feb 28 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.11-20140303 - Configure now enables the SQL front end by default. diff --git a/buildtools/ChangeLog.Jan2014 b/buildtools/ChangeLog.Jan2014 --- a/buildtools/ChangeLog.Jan2014 +++ b/buildtools/ChangeLog.Jan2014 @@ -1,11 +1,3 @@ # ChangeLog file for buildtools # This file is updated with Maddlog -* Wed Apr 30 2014 Sjoerd Mullender <sjo...@acm.org> -- Lots of minor fixes were made for potential defects found by Coverity - Scan. - -* Mon Mar 24 2014 Sjoerd Mullender <sjo...@acm.org> -- On Windows we now build the geom module against version 3.4.2 of the - geos library. - diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive --- a/clients/ChangeLog-Archive +++ b/clients/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Tue Apr 1 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.15-20140508 +- ODBC: Implemented {call procedure-name(...)} escape. The version + {?=call ...} is not implemented. + * Fri Sep 6 2013 Sjoerd Mullender <sjo...@acm.org> - 11.17.1-20140114 - ODBC: Implemented {fn scalar()} and {interval ...} escapes. diff --git a/clients/ChangeLog.Jan2014 b/clients/ChangeLog.Jan2014 --- a/clients/ChangeLog.Jan2014 +++ b/clients/ChangeLog.Jan2014 @@ -1,7 +1,3 @@ # ChangeLog file for clients # This file is updated with Maddlog -* Tue Apr 1 2014 Sjoerd Mullender <sjo...@acm.org> -- ODBC: Implemented {call procedure-name(...)} escape. The version - {?=call ...} is not implemented. - diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,60 @@ +monetdb (11.17.15-20140508) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Thu, 08 May 2014 14:21:39 +0200 + +monetdb (11.17.15-20140508) unstable; urgency=low + + * Rebuilt. + * BZ#3424: numeric values at the front of strings determines whether + CAST works successfully + * BZ#3439: Python driver drops milliseconds from timestamps + * BZ#3446: SET READ ONLY forgets previous changes + * BZ#3455: String columns unusable from 64-bit .NET via ODBC + * BZ#3456: Insert fails + * BZ#3457: When kernel of remote client crashes, the connection remains + established on server side + * BZ#3458: mserver5 crash on SQL: SELECT COUNT(*) FROM SYS.TABLES HAVING + COUNT(*) > 0 + * BZ#3461: mserver5 crash on SQL: SELECT * FROM SYS.ARGS WHERE FUNC_ID + NOT IN (SELECT ID FROM SYS.FUNCTIONS) OR FUNC_ID NOT IN (SELECT * + FROM SYS.FUNCTIONS) + * BZ#3462: Invalid SQL (IN with subquery which returns multiple columns) + is accepted + * BZ#3463: Crash on SELECT with SERIAL aggregation and GROUP BY column + alias's + * BZ#3468: Local temporary table persists across sessions + * BZ#3469: Absolute network paths considered invalid for COPY INTO + ... FROM statement. + * BZ#3473: Various memory leaks in SQL compilation + * BZ#3477: ODBC driver raises "unexpected end of input" for prepared + string parameter from .NET application + * BZ#3481: Cannot run multiple COPY INTO statements in one 's'-command + + -- Sjoerd Mullender <sjo...@acm.org> Thu, 08 May 2014 14:21:36 +0200 + +monetdb (11.17.15-20140508) unstable; urgency=low + + * buildtools: Lots of minor fixes were made for potential defects found by Coverity + Scan. + + -- Sjoerd Mullender <sjo...@acm.org> Wed, 30 Apr 2014 14:21:36 +0200 + +monetdb (11.17.15-20140508) unstable; urgency=low + + * clients: ODBC: Implemented {call procedure-name(...)} escape. The version + {?=call ...} is not implemented. + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 1 Apr 2014 14:21:36 +0200 + +monetdb (11.17.15-20140508) unstable; urgency=low + + * buildtools: On Windows we now build the geom module against version 3.4.2 of the + geos library. + + -- Sjoerd Mullender <sjo...@acm.org> Mon, 24 Mar 2014 14:21:36 +0200 + monetdb (11.17.13-20140306) 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:6:0 +GDK_VERSION=10:7: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:6:0 +MONETDB5_VERSION=16:7:0 # version of the STREAM library (subdirectory common/stream) -STREAM_VERSION=5:2:0 +STREAM_VERSION=5:3:0 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
