Changeset: 64f37c7789fc for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=64f37c7789fc Added Files: buildtools/ChangeLog.Jul2015 clients/ChangeLog.Jul2015 clients/mapilib/ChangeLog.Jul2015 clients/python2/ChangeLog.Jul2015 clients/python3/ChangeLog.Jul2015 common/stream/ChangeLog.Jul2015 gdk/ChangeLog.Jul2015 geom/ChangeLog.Jul2015 java/ChangeLog.Jul2015 monetdb5/ChangeLog.Jul2015 sql/ChangeLog.Jul2015 sql/scripts/27_rejects.sql sql/test/BugTracker-2015/Tests/crash.Bug-3736.sql sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.err sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out sql/test/copy/Tests/ingestion.sql sql/test/copy/Tests/ingestion.stable.err sql/test/copy/Tests/ingestion.stable.out sql/test/copy/Tests/int_parse_best.sql sql/test/copy/Tests/int_parse_best.stable.err sql/test/copy/Tests/int_parse_best.stable.out sql/test/copy/Tests/key_copy.sql sql/test/copy/Tests/key_copy.stable.err sql/test/copy/Tests/key_copy.stable.out sql/test/copy/Tests/nonutf8.sql sql/test/copy/Tests/nonutf8.stable.err sql/test/copy/Tests/nonutf8.stable.out testing/ChangeLog.Jul2015 tools/merovingian/ChangeLog.Jul2015 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 clients/ChangeLog clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 clients/Tests/exports.stable.out clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/python2/setup.py clients/python3/setup.py configure.ag gdk/ChangeLog gdk/gdk.h gdk/gdk_atoms.c gdk/gdk_logger.c gdk/gdk_storage.c gdk/libbat.rc geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err monetdb5/ChangeLog monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows.single monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single monetdb5/mal/mal_client.c monetdb5/mal/mal_client.h monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/mtime.h monetdb5/modules/atoms/mtime.mal monetdb5/modules/kernel/bat5.c monetdb5/modules/mal/tablet.c monetdb5/modules/mal/tablet.h monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_remap.c monetdb5/tools/libmonetdb5.rc sql/ChangeLog sql/backends/monet5/Tests/limithack.stable.out sql/backends/monet5/UDF/Tests/udf-fuse.stable.out sql/backends/monet5/UDF/Tests/udf-reverse.stable.out sql/backends/monet5/generator/Tests/generator01.sql sql/backends/monet5/generator/Tests/generator01.stable.err sql/backends/monet5/generator/Tests/generator02.sql sql/backends/monet5/generator/Tests/generator04.sql sql/backends/monet5/generator/Tests/generator04.stable.err sql/backends/monet5/generator/generator.mal sql/backends/monet5/sql.c sql/backends/monet5/sql.h sql/backends/monet5/sql.mal sql/backends/monet5/sql_execute.h sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_result.c sql/backends/monet5/sql_result.h sql/backends/monet5/sql_upgrades.c sql/benchmarks/ATIS/Tests/select_group.stable.out sql/benchmarks/ssbm/Tests/01-explain.stable.out sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/02-explain.stable.out sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/03-explain.stable.out sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/04-explain.stable.out sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/05-explain.stable.out sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/06-explain.stable.out sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/07-explain.stable.out sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/08-explain.stable.out sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/09-explain.stable.out sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/10-explain.stable.out sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/11-explain.stable.out sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/12-explain.stable.out sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/13-explain.stable.out sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/09.stable.out sql/benchmarks/tpch/LOCKED/Tests/09.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/alter.stable.out sql/benchmarks/tpch/Tests/01-22.stable.out sql/benchmarks/tpch/Tests/01-explain.stable.out sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit sql/benchmarks/tpch/Tests/01-explain.stable.out.int128 sql/benchmarks/tpch/Tests/02-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out.int128 sql/benchmarks/tpch/Tests/04-explain.stable.out sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit sql/benchmarks/tpch/Tests/05-explain.stable.out sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit sql/benchmarks/tpch/Tests/05-explain.stable.out.int128 sql/benchmarks/tpch/Tests/06-explain.stable.out sql/benchmarks/tpch/Tests/06-explain.stable.out.int128 sql/benchmarks/tpch/Tests/07-explain.stable.out sql/benchmarks/tpch/Tests/07-explain.stable.out.int128 sql/benchmarks/tpch/Tests/08-explain.stable.out sql/benchmarks/tpch/Tests/08-explain.stable.out.int128 sql/benchmarks/tpch/Tests/09-explain.stable.out sql/benchmarks/tpch/Tests/09-explain.stable.out.int128 sql/benchmarks/tpch/Tests/10-explain.stable.out sql/benchmarks/tpch/Tests/10-explain.stable.out.int128 sql/benchmarks/tpch/Tests/11-explain.stable.out sql/benchmarks/tpch/Tests/11-explain.stable.out.int128 sql/benchmarks/tpch/Tests/12-explain.stable.out sql/benchmarks/tpch/Tests/12-explain.stable.out.int128 sql/benchmarks/tpch/Tests/13-explain.stable.out sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit sql/benchmarks/tpch/Tests/14-explain.stable.out sql/benchmarks/tpch/Tests/14-explain.stable.out.int128 sql/benchmarks/tpch/Tests/14-plan.stable.out sql/benchmarks/tpch/Tests/14.stable.out sql/benchmarks/tpch/Tests/15-explain.stable.out sql/benchmarks/tpch/Tests/15-explain.stable.out.int128 sql/benchmarks/tpch/Tests/16-explain.stable.out sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit sql/benchmarks/tpch/Tests/17-explain.stable.out sql/benchmarks/tpch/Tests/17-explain.stable.out.int128 sql/benchmarks/tpch/Tests/18-explain.stable.out sql/benchmarks/tpch/Tests/18-explain.stable.out.int128 sql/benchmarks/tpch/Tests/19-explain.stable.out sql/benchmarks/tpch/Tests/19-explain.stable.out.int128 sql/benchmarks/tpch/Tests/20-explain.stable.out sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit sql/benchmarks/tpch/Tests/20-explain.stable.out.int128 sql/benchmarks/tpch/Tests/21-explain.stable.out sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit sql/benchmarks/tpch/Tests/22-explain.stable.out sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit sql/benchmarks/tpch/Tests/22-explain.stable.out.int128 sql/common/sql_backend.c sql/common/sql_types.c sql/include/sql_catalog.h sql/jdbc/tests/Tests/Test_Dobjects.stable.out sql/scripts/17_temporal.sql sql/scripts/Makefile.ag sql/server/rel_optimizer.c sql/server/rel_updates.c sql/server/sql_parser.y sql/server/sql_scan.c sql/storage/bat/bat_storage.c sql/storage/bat/bat_table.c sql/storage/sql_storage.h sql/storage/store.c sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.stable.err 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/POWER_vs_prod.SF-2596114.stable.out sql/test/BugTracker-2009/Tests/copy_into_error_off_by_one.SF-2833696.stable.err sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out sql/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.stable.err sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Darwin sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Windows sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit sql/test/BugTracker-2010/Tests/incomplete-utf8-sequence.Bug-2575.stable.err sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128 sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128 sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128.single sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single sql/test/BugTracker-2014/Tests/in_incorrect_multi.Bug-3462.stable.err sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single sql/test/BugTracker-2014/Tests/too_general_errmsg.Bug-3605.stable.err sql/test/BugTracker-2014/Tests/two-column-aggr-with-null.Bug-3428.stable.out sql/test/BugTracker-2015/Tests/All sql/test/BugTracker/Tests/copy_decimal.SF-1582957.stable.err sql/test/BugTracker/Tests/copy_overflow_null_bug.SF-1842550.stable.err sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit sql/test/Dependencies/Tests/dependency_loop.stable.out sql/test/Dependencies/Tests/dependency_loop.stable.out.int128 sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/copy/Tests/All sql/test/copy/Tests/int_parse.sql sql/test/copy/Tests/int_parse.stable.err sql/test/copy/Tests/int_parse.stable.out sql/test/copy/Tests/load_stdin_incorrect_line_nr.sql sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.err sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.out sql/test/copy/Tests/null_as_string_errors.sql sql/test/copy/Tests/null_as_string_errors.stable.err sql/test/copy/Tests/null_as_string_errors.stable.out sql/test/leaks/Tests/check0.stable.out sql/test/leaks/Tests/check0.stable.out.int128 sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check5.stable.out sql/test/leaks/Tests/check5.stable.out.int128 sql/test/leaks/Tests/drop3.stable.out sql/test/leaks/Tests/select1.stable.out sql/test/leaks/Tests/select2.stable.out sql/test/leaks/Tests/temp1.stable.out sql/test/leaks/Tests/temp2.stable.out sql/test/leaks/Tests/temp3.stable.out sql/test/mergetables/Tests/forex.sql sql/test/mergetables/Tests/forex.stable.out sql/test/mergetables/Tests/mergedrop.sql sql/test/mergetables/Tests/mergekey.sql sql/test/pg_regress/Tests/alter_table.stable.err sql/test/pg_regress/Tests/insert.stable.err sql/test/pg_regress/Tests/time.stable.err sql/test/pg_regress/Tests/timetz.stable.err sql/test/testdb-upgrade-chain/Tests/dump.stable.out sql/test/testdb-upgrade-chain/Tests/dump.stable.out.Windows sql/test/testdb-upgrade/Tests/dump.stable.out sql/test/testdb-upgrade/Tests/dump.stable.out.Windows sql/test/utf8/run.all vertoo.data Branch: transaction-replication Log Message:
Merge with default branch Resolve merge conflics in gdk_logger.c as a result of the split on logger_new in TR diffs (truncated from 26895 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -596,3 +596,4 @@ 027c8ada676bad1e7af0703ae48c27c6fb8433a0 a1a48562a4651b1beb3168290777cbeb91f474d8 Oct2014_15 027c8ada676bad1e7af0703ae48c27c6fb8433a0 Oct2014_SP4_release a1a48562a4651b1beb3168290777cbeb91f474d8 Oct2014_SP4_release +71a9c48c90348eab78069f2ecc616e3f73bbba95 Jul2015_root diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1,5 +1,5 @@ %define name MonetDB -%define version 11.20.0 +%define version 11.22.0 %{!?buildno: %define buildno %(date +%Y%m%d)} # groups of related archs 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 @@ -574,7 +574,7 @@ "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.20.0" + "ProductVersion" = "8:11.22.0" "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 @@ -439,7 +439,7 @@ "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.20.0" + "ProductVersion" = "8:11.22.0" "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 @@ -2390,7 +2390,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA" { - "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.20.0\\dump-restore.txt" + "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.22.0\\dump-restore.txt" "TargetName" = "8:dump-restore.txt" "Tag" = "8:" "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37" @@ -2970,7 +2970,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6" { - "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.20.0\\dump-restore.html" + "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.22.0\\dump-restore.html" "TargetName" = "8:dump-restore.html" "Tag" = "8:" "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37" @@ -4194,7 +4194,7 @@ { "{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37" { - "Name" = "8:MonetDB-SQL-11.20.0" + "Name" = "8:MonetDB-SQL-11.22.0" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" "Transitive" = "11:FALSE" @@ -4244,7 +4244,7 @@ "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.20.0" + "ProductVersion" = "8:11.22.0" "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 @@ -574,7 +574,7 @@ "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.20.0" + "ProductVersion" = "8:11.22.0" "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 @@ -439,7 +439,7 @@ "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.20.0" + "ProductVersion" = "8:11.22.0" "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 @@ -2390,7 +2390,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_667BD650736E43C9A8B6899179FA0CAA" { - "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.20.0\\dump-restore.txt" + "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.22.0\\dump-restore.txt" "TargetName" = "8:dump-restore.txt" "Tag" = "8:" "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37" @@ -2970,7 +2970,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A9DB6CF8297A4BEEAF7A6D4958A4B0D6" { - "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.20.0\\dump-restore.html" + "SourcePath" = "8:share\\doc\\MonetDB-SQL-11.22.0\\dump-restore.html" "TargetName" = "8:dump-restore.html" "Tag" = "8:" "Folder" = "8:_6C21CE578F0941D09FDD9951A229FF37" @@ -4194,7 +4194,7 @@ { "{9EF0B969-E518-4E46-987F-47570745A589}:_6C21CE578F0941D09FDD9951A229FF37" { - "Name" = "8:MonetDB-SQL-11.20.0" + "Name" = "8:MonetDB-SQL-11.22.0" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" "Transitive" = "11:FALSE" @@ -4244,7 +4244,7 @@ "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:11.20.0" + "ProductVersion" = "8:11.22.0" "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 @@ -782,13 +782,13 @@ #define PACKAGE_NAME "MonetDB" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "MonetDB 11.20.0" +#define PACKAGE_STRING "MonetDB 11.22.0" /* 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.20.0" +#define PACKAGE_VERSION "11.22.0" /* 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 @@ -6,7 +6,7 @@ # # Copyright 2008-2015 MonetDB B.V. -VERSION=11.20.0 +VERSION=11.22.0 # ^^^^^^ # Maintained via vertoo. Please don't modify by hand! # Contact monetdb-develop...@lists.sourceforge.net for details and/or assistance. diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog --- a/buildtools/ChangeLog +++ b/buildtools/ChangeLog @@ -1,6 +1,3 @@ # ChangeLog file for buildtools # This file is updated with Maddlog -* Wed Mar 4 2015 Sjoerd Mullender <sjo...@acm.org> -- Upgraded the license to the Mozilla Public License Version 2.0. - diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog.Jul2015 copy from buildtools/ChangeLog copy to buildtools/ChangeLog.Jul2015 diff --git a/clients/ChangeLog b/clients/ChangeLog --- a/clients/ChangeLog +++ b/clients/ChangeLog @@ -1,7 +1,3 @@ # ChangeLog file for clients # This file is updated with Maddlog -* Thu Feb 19 2015 Sjoerd Mullender <sjo...@acm.org> -- Added a new output format to mclient: --format=expanded (or -fx). - In this format, column values are shown in full and below each other. - diff --git a/clients/ChangeLog b/clients/ChangeLog.Jul2015 copy from clients/ChangeLog copy to clients/ChangeLog.Jul2015 diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -40503,11 +40503,11 @@ pattern sql.current_time():daytime address SQLcurrent_daytime; comment Get the clients current daytime -pattern sql.copyfrom(t:ptr,sep:str,rsep:str,ssep:str,ns:str,nr:lng,offset:lng,locked:int):bat[:oid,:any]... -address mvc_import_table_stdin; -comment Import a table from bstream s with the given tuple and seperators (sep/rsep) - -pattern sql.copy_from(t:ptr,sep:str,rsep:str,ssep:str,ns:str,fname:str,nr:lng,offset:lng,locked:int):bat[:oid,:any]... +pattern sql.copy_rejects_clear():void +address COPYrejects_clear; +pattern sql.copy_rejects() (rowid:bat[:oid,:lng],fldid:bat[:oid,:int],msg:bat[:oid,:str],inp:bat[:oid,:str]) +address COPYrejects; +pattern sql.copy_from(t:ptr,sep:str,rsep:str,ssep:str,ns:str,fname:str,nr:lng,offset:lng,locked:int,best:int):bat[:oid,:any]... address mvc_import_table_wrap; comment Import a table from bstream s with the given tuple and seperators (sep/rsep) @@ -40663,10 +40663,6 @@ comment Return column bat with delta's a command sql.epilogue():void address SQLepilogue; -pattern sql.exportValue{unsafe}(qtype:int,tname:str,name:str,typename:str,digits:int,scale:int,eclass:int,val:any_1,w:str):void -address mvc_export_value_wrap; -comment export a single value onto the stream s - pattern sql.exportOperation{unsafe}(w:str):void address mvc_export_operation_wrap; comment Export result of schema/transaction queries @@ -40687,6 +40683,14 @@ pattern sql.exportHead{unsafe}(s:streams address mvc_export_head_wrap; comment Export a result (in order) to stream s +pattern sql.export_table{unsafe}(fname:str,fmt:str,colsep:str,recsep:str,qout:str,nullrep:str,tbl:bat[:oid,:str],attr:bat[:oid,:str],tpe:bat[:oid,:str],len:bat[:oid,:int],scale:bat[:oid,:int],cols:bat[:oid,:any]...):int +address mvc_export_table_wrap; +comment Prepare a table result set for the COPY INTO stream + +pattern sql.export_table{unsafe}(fname:str,fmt:str,colsep:str,recsep:str,qout:str,nullrep:str,tbl:bat[:oid,:str],attr:bat[:oid,:str],tpe:bat[:oid,:str],len:bat[:oid,:int],scale:bat[:oid,:int],cols:any...):int +address mvc_export_row_wrap; +comment Prepare a table result set for the COPY INTO stream + pattern sql.evalAlgebra(cmd:str,optimize:bit):void address RAstatement; comment Compile and execute a single 'relational algebra' statement @@ -40827,29 +40831,17 @@ command sql.round(v:bte,d:int,s:int,r:bt address bte_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) -pattern sql.rsColumn{unsafe}(rs:int,tname:str,name:str,typename:str,digits:int,scale:int,col:bat[:oid,:any_1]):void -address mvc_result_column_wrap; -comment Add the column to the table query result - -pattern sql.rsColumn{unsafe}(rs:int,tname:str,name:str,typename:str,digits:int,scale:int,val:any_1):void -address mvc_result_value_wrap; -comment Add the value to the row query result - -pattern sql.resultSet{unsafe}(nr_cols:int,qtype:int,order:bat[:oid,:any_1]):int -address mvc_result_table_wrap; +pattern sql.resultSet{unsafe}(tbl:bat[:oid,:str],attr:bat[:oid,:str],tpe:bat[:oid,:str],len:bat[:oid,:int],scale:bat[:oid,:int],cols:bat[:oid,:any]...):int +address mvc_table_result_wrap; +comment Prepare a table result set for the client in default CSV format + +pattern sql.resultSet{unsafe}(tbl:bat[:oid,:str],attr:bat[:oid,:str],tpe:bat[:oid,:str],len:bat[:oid,:int],scale:bat[:oid,:int],cols:any...):int +address mvc_row_result_wrap; comment Prepare a table result set -pattern sql.resultSet{unsafe}(nr_cols:int,qtype:int,order:any_1):int -address mvc_result_row_wrap; -comment Prepare a row result set - -pattern sql.resultSet{unsafe}(nr_cols:int,sep:str,rsep:str,ssep:str,ns:str,order:bat[:oid,:any_1]):int -address mvc_result_file_wrap; -comment Prepare a file result set - -pattern sql.resultSet{unsafe}(nr_cols:int,sep:str,rsep:str,ssep:str,ns:str,order:any_1):int -address mvc_result_file_wrap; -comment Prepare a file result set +pattern sql.resultSet{unsafe}(tbl:str,attr:str,tpe:str,len:int,scale:int,eclass:int,val:any):int +address mvc_scalar_value_wrap; +comment Prepare a table result set pattern sql.restart{unsafe}(sname:str,sequence:str,start:lng):lng address mvc_restart_seq; @@ -41115,6 +41107,10 @@ command str.substitute(s:str,src:str,dst address STRSubstitute; comment Substitute first occurrence of 'src' by 'dst'. Iff repeated = true this is repeated while 'src' can be found in the result string. In order to prevent recursion and result strings of unlimited size, repeating is only done iff src is not a substring of dst. +command str.splitpart(s:str,needle:str,field:int):str +address STRsplitpart; +comment Split string on delimiter. Returns given field (counting from one.) + command str.search(s:str,c:str):int address STRstrSearch; comment Search for a substring. Returns position, -1 if not found. diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list