Changeset: 5228a9247415 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5228a9247415
Added Files:
        sql/backends/monet5/sql_fround_impl.h
        sql/backends/monet5/sql_round_impl.h
Modified Files:
        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
        README
        buildtools/ChangeLog-Archive
        buildtools/ChangeLog.Jan2014
        clients/ChangeLog-Archive
        clients/ChangeLog.Jan2014
        clients/Tests/exports.stable.out
        clients/mapiclient/ReadlineTools.c
        clients/mapiclient/dump.c
        clients/mapiclient/mclient.c
        clients/mapiclient/msqldump.c
        clients/mapiclient/tomograph.c
        clients/mapilib/mapi.rc
        clients/odbc/driver/ODBCConvert.c
        clients/odbc/driver/ODBCEnv.c
        clients/odbc/driver/ODBCError.c
        clients/odbc/driver/ODBCStmt.c
        clients/odbc/driver/ODBCUtil.c
        clients/odbc/driver/ODBCUtil.h
        clients/odbc/driver/SQLBrowseConnect.c
        clients/odbc/driver/SQLColAttribute.c
        clients/odbc/driver/SQLColAttributes.c
        clients/odbc/driver/SQLColumnPrivileges.c
        clients/odbc/driver/SQLColumns.c
        clients/odbc/driver/SQLConnect.c
        clients/odbc/driver/SQLDataSources.c
        clients/odbc/driver/SQLDescribeCol.c
        clients/odbc/driver/SQLDriverConnect.c
        clients/odbc/driver/SQLError.c
        clients/odbc/driver/SQLExecDirect.c
        clients/odbc/driver/SQLExecute.c
        clients/odbc/driver/SQLForeignKeys.c
        clients/odbc/driver/SQLGetConnectAttr.c
        clients/odbc/driver/SQLGetConnectOption.c
        clients/odbc/driver/SQLGetCursorName.c
        clients/odbc/driver/SQLGetDescField.c
        clients/odbc/driver/SQLGetDescRec.c
        clients/odbc/driver/SQLGetDiagRec.c
        clients/odbc/driver/SQLGetInfo.c
        clients/odbc/driver/SQLNativeSql.c
        clients/odbc/driver/SQLPrepare.c
        clients/odbc/driver/SQLPrimaryKeys.c
        clients/odbc/driver/SQLProcedures.c
        clients/odbc/driver/SQLSetConnectAttr.c
        clients/odbc/driver/SQLSetDescField.c
        clients/odbc/driver/SQLSpecialColumns.c
        clients/odbc/driver/SQLStatistics.c
        clients/odbc/driver/SQLTablePrivileges.c
        clients/odbc/driver/SQLTables.c
        clients/odbc/driver/driver.rc
        clients/odbc/winsetup/setup.rc
        clients/python2/monetdb/sql/pythonize.py
        clients/python2/setup.py
        clients/python2/test/capabilities.py
        clients/python3/monetdb/sql/pythonize.py
        clients/python3/setup.py
        clients/python3/test/capabilities.py
        common/stream/stream.c
        common/utils/mcrypt.c
        common/utils/msabaoth.c
        common/utils/mutils.c
        common/utils/mutils.h
        configure.ag
        debian/changelog
        gdk/gdk.h
        gdk/gdk_atoms.c
        gdk/gdk_atoms.h
        gdk/gdk_bat.c
        gdk/gdk_bbp.c
        gdk/gdk_bbp.h
        gdk/gdk_group.c
        gdk/gdk_heap.c
        gdk/gdk_imprints.c
        gdk/gdk_imprints.h
        gdk/gdk_join.c
        gdk/gdk_logger.c
        gdk/gdk_posix.c
        gdk/gdk_private.h
        gdk/gdk_search.c
        gdk/gdk_select.c
        gdk/gdk_select_legacy.c
        gdk/gdk_ssort.c
        gdk/gdk_storage.c
        gdk/gdk_utils.c
        gdk/libbat.rc
        geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
        java/Makefile.ag
        java/build.properties
        java/pom.xml
        java/release.txt
        java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
        libversions
        monetdb5/extras/jaql/jaql.c
        monetdb5/extras/jaql/json.c
        monetdb5/extras/sphinx/sphinx.c
        monetdb5/mal/mal_atom.c
        monetdb5/mal/mal_box.c
        monetdb5/mal/mal_builder.c
        monetdb5/mal/mal_debugger.c
        monetdb5/mal/mal_function.c
        monetdb5/mal/mal_instruction.c
        monetdb5/mal/mal_interpreter.c
        monetdb5/mal/mal_linker.c
        monetdb5/mal/mal_parser.c
        monetdb5/mal/mal_profiler.c
        monetdb5/mal/mal_recycle.c
        monetdb5/mal/mal_runtime.c
        monetdb5/modules/atoms/mcurl.c
        monetdb5/modules/atoms/mtime.c
        monetdb5/modules/atoms/str.c
        monetdb5/modules/atoms/xml.c
        monetdb5/modules/kernel/aggr.c
        monetdb5/modules/kernel/array.c
        monetdb5/modules/mal/batExtensions.c
        monetdb5/modules/mal/cluster.c
        monetdb5/modules/mal/groupby.c
        monetdb5/modules/mal/language.c
        monetdb5/modules/mal/mal_mapi.c
        monetdb5/modules/mal/mat.c
        monetdb5/modules/mal/pcre.c
        monetdb5/modules/mal/remote.c
        monetdb5/modules/mal/tablet.c
        monetdb5/modules/mal/tokenizer.c
        monetdb5/modules/mal/txtsim.c
        monetdb5/modules/mal/urlbox.c
        monetdb5/optimizer/opt_macro.c
        monetdb5/optimizer/opt_mergetable.c
        monetdb5/optimizer/opt_multiplex.c
        monetdb5/optimizer/opt_octopus.c
        monetdb5/optimizer/opt_pushselect.c
        monetdb5/optimizer/opt_querylog.c
        monetdb5/optimizer/opt_statistics.c
        monetdb5/optimizer/opt_wrapper.c
        monetdb5/scheduler/run_octopus.c
        monetdb5/scheduler/srvpool.c
        monetdb5/tools/libmonetdb5.rc
        sql/backends/monet5/Makefile.ag
        sql/backends/monet5/rel_bin.c
        sql/backends/monet5/sql.c
        sql/backends/monet5/sql_cast_impl_down_from_int.h
        sql/backends/monet5/sql_fround.c
        sql/backends/monet5/sql_gencode.c
        sql/backends/monet5/sql_round.c
        sql/backends/monet5/sql_scenario.c
        sql/backends/monet5/sql_statement.c
        sql/backends/monet5/sql_statistics.c
        sql/backends/monet5/vaults/fits.c
        sql/backends/monet5/vaults/vault.c
        sql/common/sql_list.c
        sql/common/sql_types.c
        sql/server/rel_distribute.c
        sql/server/rel_dump.c
        sql/server/rel_exp.c
        sql/server/rel_optimizer.c
        sql/server/rel_planner.c
        sql/server/rel_psm.c
        sql/server/rel_schema.c
        sql/server/rel_select.c
        sql/server/rel_updates.c
        sql/server/sql_datetime.c
        sql/server/sql_mvc.c
        sql/server/sql_privileges.c
        sql/server/sql_qc.c
        sql/server/sql_scan.c
        sql/server/sql_semantic.c
        sql/storage/bat/bat_storage.c
        sql/storage/store.c
        sql/test/BugTracker-2008/Tests/copy-format.SF-2468513.stable.err
        sql/test/BugTracker-2008/Tests/varchar.SF-2471371.stable.err
        
sql/test/BugTracker-2009/Tests/copy_into_error_off_by_one.SF-2833696.stable.err
        
sql/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.stable.err
        
sql/test/BugTracker-2010/Tests/incomplete-utf8-sequence.Bug-2575.stable.err
        sql/test/BugTracker/Tests/copy_decimal.SF-1582957.stable.err
        sql/test/BugTracker/Tests/copy_overflow_null_bug.SF-1842550.stable.err
        sql/test/copy/Tests/int_parse.stable.err
        sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.err
        sql/test/copy/Tests/null_as_string_errors.stable.err
        sql/test/mapi/Tests/python2_test_monetdb_sql.stable.err
        sql/test/mapi/Tests/python3_test_monetdb_sql.stable.err
        sql/test/testdb/Tests/testdb-load.stable.out
        tools/merovingian/client/monetdb.c
        tools/merovingian/daemon/controlrunner.c
        tools/merovingian/daemon/forkmserver.c
        tools/merovingian/daemon/merovingian.c
        tools/merovingian/daemon/merovingian.h
        tools/mserver/monet_version.c.in
        tools/mserver/mserver5.c
        vertoo.data
Branch: int128
Log Message:

Merge with Jan2014 branch (tag Jan2014_15 / changeset c91c4d792dee)


diffs (truncated from 13887 to 300 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
 %define name MonetDB
-%define version 11.17.14
+%define version 11.17.15
 %{!?buildno: %define buildno %(date +%Y%m%d)}
 
 # groups of related archs
@@ -45,7 +45,7 @@ Vendor: MonetDB BV <[email protected]>
 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
@@ -828,6 +828,45 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetD
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Thu May 08 2014 Sjoerd Mullender <[email protected]> - 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 <[email protected]> - 11.17.15-20140508
+- buildtools: Lots of minor fixes were made for potential defects found by 
Coverity
+  Scan.
+
+* Tue Apr  1 2014 Sjoerd Mullender <[email protected]> - 11.17.15-20140508
+- clients: ODBC: Implemented {call procedure-name(...)} escape.  The version
+  {?=call ...} is not implemented.
+
+* Mon Mar 24 2014 Sjoerd Mullender <[email protected]> - 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 <[email protected]> - 11.17.13-20140306
 - Rebuilt.
 - BZ#3452: ODBC driver build fails on Mac OS X due to a conflicting
diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj 
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -566,15 +566,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:MonetDB ODBC Driver"
-        "ProductCode" = "8:{4FE34953-AC9E-4D32-BD59-5365141F3EF4}"
-        "PackageCode" = "8:{D0E72C9E-70B6-4A60-80C2-4BCFB415D2DC}"
+        "ProductCode" = "8:{F8351679-BA45-4C51-897F-138A4712197F}"
+        "PackageCode" = "8:{48D0C51A-DD47-4E8C-9C9B-766817EBCE86}"
         "UpgradeCode" = "8:{C1F69378-3F5C-4120-8224-32F07D3458F3}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:11.17.14"
+        "ProductVersion" = "8:11.17.15"
         "Manufacturer" = "8:MonetDB"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj 
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -425,14 +425,14 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:MonetDB5 SQL GIS Module"
-        "ProductCode" = "8:{CD44F2E1-A835-48A6-B7CB-C300A5CEF7B7}"
-        "PackageCode" = "8:{DD758DE3-9C21-4A2F-AA66-D225CC2E161F}"
+        "ProductCode" = "8:{4541B333-73C5-4825-9F93-463B42029D69}"
+        "PackageCode" = "8:{F7763C29-A3DF-498A-91A5-37267E18F77F}"
         "UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:11.17.14"
+        "ProductVersion" = "8:11.17.15"
         "Manufacturer" = "8:MonetDB"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj 
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -2407,7 +2407,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
             {
-            "SourcePath" = 
"8:share\\doc\\MonetDB-SQL-11.17.14\\dump-restore.txt"
+            "SourcePath" = 
"8:share\\doc\\MonetDB-SQL-11.17.15\\dump-restore.txt"
             "TargetName" = "8:dump-restore.txt"
             "Tag" = "8:"
             "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3207,7 +3207,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
             {
-            "SourcePath" = 
"8:share\\doc\\MonetDB-SQL-11.17.14\\dump-restore.html"
+            "SourcePath" = 
"8:share\\doc\\MonetDB-SQL-11.17.15\\dump-restore.html"
             "TargetName" = "8:dump-restore.html"
             "Tag" = "8:"
             "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -4511,7 +4511,7 @@
                                 {
                                     
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
                                     {
-                                    "Name" = "8:MonetDB-SQL-11.17.14"
+                                    "Name" = "8:MonetDB-SQL-11.17.15"
                                     "AlwaysCreate" = "11:FALSE"
                                     "Condition" = "8:"
                                     "Transitive" = "11:FALSE"
@@ -4553,15 +4553,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:MonetDB5"
-        "ProductCode" = "8:{B6A83DDB-B215-4B7D-8FED-BBF00B333A0C}"
-        "PackageCode" = "8:{71E19B1E-5DDC-4137-9571-48FB4D2CAB97}"
+        "ProductCode" = "8:{5C371644-499B-402C-8689-5905391E14E8}"
+        "PackageCode" = "8:{DFDD6CE1-08A7-41E0-8DC5-98763193E90A}"
         "UpgradeCode" = "8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:11.17.14"
+        "ProductVersion" = "8:11.17.15"
         "Manufacturer" = "8:MonetDB"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj 
b/NT/installer64/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer64/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj
@@ -566,15 +566,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:MonetDB ODBC Driver"
-        "ProductCode" = "8:{A7F3A2E5-BF45-4998-92AE-13D5F625F743}"
-        "PackageCode" = "8:{A2F38F9A-E29B-417E-B0F7-371B1C8C1B5F}"
+        "ProductCode" = "8:{AE05DD9B-75DC-4F9D-96EA-C6B94B87DDEA}"
+        "PackageCode" = "8:{9FE6246C-AD45-4212-B4A2-660CE4DC674D}"
         "UpgradeCode" = "8:{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:11.17.14"
+        "ProductVersion" = "8:11.17.15"
         "Manufacturer" = "8:MonetDB"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB5-Geom-Module.vdproj 
b/NT/installer64/MonetDB5-Geom-Module.vdproj
--- a/NT/installer64/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer64/MonetDB5-Geom-Module.vdproj
@@ -425,14 +425,14 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:MonetDB5 SQL GIS Module"
-        "ProductCode" = "8:{C49139B7-7F4C-4DE6-8837-F3086C33EC39}"
-        "PackageCode" = "8:{29F9F6B0-DAFD-44B1-AD0C-665B64D310EE}"
+        "ProductCode" = "8:{B0DFC2B5-7A58-4B29-9052-AC63569824F7}"
+        "PackageCode" = "8:{65778A40-1327-4451-A90A-EB102AD2DEEB}"
         "UpgradeCode" = "8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:11.17.14"
+        "ProductVersion" = "8:11.17.15"
         "Manufacturer" = "8:MonetDB"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj 
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -2407,7 +2407,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA"
             {
-            "SourcePath" = 
"8:share\\doc\\MonetDB-SQL-11.17.14\\dump-restore.txt"
+            "SourcePath" = 
"8:share\\doc\\MonetDB-SQL-11.17.15\\dump-restore.txt"
             "TargetName" = "8:dump-restore.txt"
             "Tag" = "8:"
             "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -3207,7 +3207,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6"
             {
-            "SourcePath" = 
"8:share\\doc\\MonetDB-SQL-11.17.14\\dump-restore.html"
+            "SourcePath" = 
"8:share\\doc\\MonetDB-SQL-11.17.15\\dump-restore.html"
             "TargetName" = "8:dump-restore.html"
             "Tag" = "8:"
             "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37"
@@ -4511,7 +4511,7 @@
                                 {
                                     
"{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37"
                                     {
-                                    "Name" = "8:MonetDB-SQL-11.17.14"
+                                    "Name" = "8:MonetDB-SQL-11.17.15"
                                     "AlwaysCreate" = "11:FALSE"
                                     "Condition" = "8:"
                                     "Transitive" = "11:FALSE"
@@ -4553,15 +4553,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:MonetDB5"
-        "ProductCode" = "8:{88234A35-83A1-461C-9C40-54DB3AF0694A}"
-        "PackageCode" = "8:{5424C256-6530-4980-B17B-EF04B53CABEC}"
+        "ProductCode" = "8:{A84A3E71-CDEF-4BD5-8198-FB7814CF994C}"
+        "PackageCode" = "8:{13FBEDD2-C70B-4DC8-B552-1EC4E2A030B2}"
         "UpgradeCode" = "8:{839D3C90-B578-41E2-A004-431440F9E899}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:11.17.14"
+        "ProductVersion" = "8:11.17.15"
         "Manufacturer" = "8:MonetDB"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://www.monetdb.org/";
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -763,7 +763,7 @@
 #define MONETDB5_PASSWDHASH "SHA512"
 
 /* Release name or "unreleased" */
-#define MONETDB_RELEASE "unreleased"
+#define MONETDB_RELEASE "Jan2014-SP2"
 
 /* Define if the oid type should use 32 bits on a 64-bit architecture */
 /* #undef MONET_OID32 */
@@ -784,13 +784,13 @@
 #define PACKAGE_NAME "MonetDB"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "MonetDB 11.17.14"
+#define PACKAGE_STRING "MonetDB 11.17.15"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "MonetDB"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "11.17.14"
+#define PACKAGE_VERSION "11.17.15"
 
 /* Define to the home page for this package. */
 #define PACKAGE_URL ""
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -17,7 +17,7 @@
 # Copyright August 2008-2014 MonetDB B.V.
 # All Rights Reserved.
 
-VERSION=11.17.14
+VERSION=11.17.15
 #       ^^^^^^
 # Maintained via vertoo. Please don't modify by hand!
 # Contact [email protected] for details and/or 
assistance.
diff --git a/README b/README
--- a/README
+++ b/README
@@ -35,4 +35,3 @@ The Initial Developer of the Original Co
 Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
 Copyright August 2008-2014 MonetDB B.V.
 All Rights Reserved.
-
diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive
--- a/buildtools/ChangeLog-Archive
+++ b/buildtools/ChangeLog-Archive
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to