Changeset: 0972eeb46bd5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0972eeb46bd5 Removed Files: sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.err-- sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.out-- sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.stable.err-- sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.stable.out-- sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-1.stable.err-- sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-1.stable.out-- sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-2.stable.err-- sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-2.stable.out-- sql/test/2-phase-commit/Tests/MixTransactionPrecommit-1.stable.err-- sql/test/2-phase-commit/Tests/MixTransactionPrecommit-1.stable.out-- sql/test/2-phase-commit/Tests/MixTransactionPrecommit-2.stable.err-- sql/test/2-phase-commit/Tests/MixTransactionPrecommit-2.stable.out-- sql/test/2-phase-commit/Tests/MixTransactionPrecommit-cleanup.stable.err-- sql/test/2-phase-commit/Tests/MixTransactionPrecommit-cleanup.stable.out-- sql/test/2-phase-commit/Tests/MultipleConnections-cleanup.stable.err-- sql/test/2-phase-commit/Tests/MultipleConnections-cleanup.stable.out-- sql/test/2-phase-commit/Tests/MultipleConnectionsAllWithAutocommit.stable.err-- sql/test/2-phase-commit/Tests/MultipleConnectionsAllWithAutocommit.stable.out-- sql/test/2-phase-commit/Tests/NonUpdatePrecommitReturns0.stable.err-- sql/test/2-phase-commit/Tests/NonUpdatePrecommitReturns0.stable.out-- sql/test/2-phase-commit/Tests/PersistBeforePrecommit-1.stable.err-- sql/test/2-phase-commit/Tests/PersistBeforePrecommit-1.stable.out-- sql/test/2-phase-commit/Tests/PersistBeforePrecommit-2.stable.err-- sql/test/2-phase-commit/Tests/PersistBeforePrecommit-2.stable.out-- sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-1.stable.err-- sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-1.stable.out-- sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-2.stable.err-- sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-2.stable.out-- sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-1.stable.err-- sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-1.stable.out-- sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-2.stable.err-- sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-2.stable.out-- sql/test/2-phase-commit/Tests/ReadsItsOwnWrites-cleanup.stable.err-- sql/test/2-phase-commit/Tests/ReadsItsOwnWrites-cleanup.stable.out-- sql/test/2-phase-commit/Tests/ReadsItsOwnWrites.stable.err-- sql/test/2-phase-commit/Tests/ReadsItsOwnWrites.stable.out-- sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-1.stable.err-- sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-1.stable.out-- sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-2.stable.err-- sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-2.stable.out-- sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-1.stable.err-- sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-1.stable.out-- sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-2.stable.err-- sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-2.stable.out-- sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-1.stable.err-- sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-1.stable.out-- sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-2.stable.err-- sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-2.stable.out-- sql/test/2-phase-commit/Tests/TestAutocommitUpdates-1.stable.err-- sql/test/2-phase-commit/Tests/TestAutocommitUpdates-1.stable.out-- sql/test/2-phase-commit/Tests/TestAutocommitUpdates-2.stable.err-- sql/test/2-phase-commit/Tests/TestAutocommitUpdates-2.stable.out-- sql/test/2-phase-commit/Tests/TestAutocommitUpdates-3.stable.err-- sql/test/2-phase-commit/Tests/TestAutocommitUpdates-3.stable.out-- sql/test/2-phase-commit/Tests/TestAutocommitUpdates-4.stable.err-- sql/test/2-phase-commit/Tests/TestAutocommitUpdates-4.stable.out-- sql/test/2-phase-commit/Tests/TwoInsetsIn1Transaction.stable.err-- sql/test/2-phase-commit/Tests/TwoInsetsIn1Transaction.stable.out-- sql/test/2-phase-commit/Tests/setup.stable.err-- sql/test/2-phase-commit/Tests/setup.stable.out-- Modified Files: sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.err sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.out sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.stable.err sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.stable.out sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-1.stable.err sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-1.stable.out sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-2.stable.err sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-2.stable.out sql/test/2-phase-commit/Tests/MixTransactionPrecommit-1.stable.err sql/test/2-phase-commit/Tests/MixTransactionPrecommit-1.stable.out sql/test/2-phase-commit/Tests/MixTransactionPrecommit-2.stable.err sql/test/2-phase-commit/Tests/MixTransactionPrecommit-2.stable.out sql/test/2-phase-commit/Tests/MixTransactionPrecommit-cleanup.stable.err sql/test/2-phase-commit/Tests/MixTransactionPrecommit-cleanup.stable.out sql/test/2-phase-commit/Tests/MultipleConnections-cleanup.stable.err sql/test/2-phase-commit/Tests/MultipleConnections-cleanup.stable.out sql/test/2-phase-commit/Tests/MultipleConnectionsAllWithAutocommit.stable.err sql/test/2-phase-commit/Tests/MultipleConnectionsAllWithAutocommit.stable.out sql/test/2-phase-commit/Tests/NonUpdatePrecommitReturns0.stable.err sql/test/2-phase-commit/Tests/NonUpdatePrecommitReturns0.stable.out sql/test/2-phase-commit/Tests/PersistBeforePrecommit-1.stable.err sql/test/2-phase-commit/Tests/PersistBeforePrecommit-1.stable.out sql/test/2-phase-commit/Tests/PersistBeforePrecommit-2.stable.err sql/test/2-phase-commit/Tests/PersistBeforePrecommit-2.stable.out sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-1.stable.err sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-1.stable.out sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-2.stable.err sql/test/2-phase-commit/Tests/PersistBeforePrecommitWithRollback-2.stable.out sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-1.stable.err sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-1.stable.out sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-2.stable.err sql/test/2-phase-commit/Tests/PrecommitWithoutPersists-2.stable.out sql/test/2-phase-commit/Tests/ReadsItsOwnWrites-cleanup.stable.err sql/test/2-phase-commit/Tests/ReadsItsOwnWrites-cleanup.stable.out sql/test/2-phase-commit/Tests/ReadsItsOwnWrites.stable.err sql/test/2-phase-commit/Tests/ReadsItsOwnWrites.stable.out sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-1.stable.err sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-1.stable.out sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-2.stable.err sql/test/2-phase-commit/Tests/RollbackAfterPersistcommitHasNoEffect-2.stable.out sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-1.stable.err sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-1.stable.out sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-2.stable.err sql/test/2-phase-commit/Tests/RollbackAfterPrecommit-2.stable.out sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-1.stable.err sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-1.stable.out sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-2.stable.err sql/test/2-phase-commit/Tests/RollbackBeforePrecommit-2.stable.out sql/test/2-phase-commit/Tests/TestAutocommitUpdates-1.stable.err sql/test/2-phase-commit/Tests/TestAutocommitUpdates-1.stable.out sql/test/2-phase-commit/Tests/TestAutocommitUpdates-2.stable.err sql/test/2-phase-commit/Tests/TestAutocommitUpdates-2.stable.out sql/test/2-phase-commit/Tests/TestAutocommitUpdates-3.stable.err sql/test/2-phase-commit/Tests/TestAutocommitUpdates-3.stable.out sql/test/2-phase-commit/Tests/TestAutocommitUpdates-4.stable.err sql/test/2-phase-commit/Tests/TestAutocommitUpdates-4.stable.out sql/test/2-phase-commit/Tests/setup.stable.err sql/test/2-phase-commit/Tests/setup.stable.out Branch: HTM Log Message:
Merge with upstream diffs (truncated from 4232 to 300 lines): diff --git a/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.err b/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.err --- a/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.err +++ b/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.err @@ -1,8 +1,8 @@ -stderr of test 'InsertWith2PCDeleteWithCommit-1` in directory 'sql/test/2-phase-commit` itself: +stderr of test 'InsertWith2PCDeleteWithCommit-1` in directory 'sql/test/HTM` itself: # 17:16:33 > -# 17:16:33 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38035" "--set" "mapi_usock=/var/tmp/mtest-1912/.s.monetdb.38035" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_2-phase-commit" "--set" "mal_listing=0" +# 17:16:33 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38035" "--set" "mapi_usock=/var/tmp/mtest-1912/.s.monetdb.38035" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_HTM" "--set" "mal_listing=0" # 17:16:33 > # builtin opt gdk_dbpath = /Users/dnedev/monetdb/installation/var/monetdb5/dbfarm/demo @@ -21,7 +21,7 @@ stderr of test 'InsertWith2PCDeleteWithC # cmdline opt mapi_usock = /var/tmp/mtest-1912/.s.monetdb.38035 # cmdline opt monet_prompt = # cmdline opt mal_listing = 2 -# cmdline opt gdk_dbpath = /Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_2-phase-commit +# cmdline opt gdk_dbpath = /Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_HTM # cmdline opt mal_listing = 0 # cmdline opt gdk_debug = 536870922 diff --git a/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.err-- b/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.err-- deleted file mode 100644 --- a/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.err-- +++ /dev/null @@ -1,36 +0,0 @@ -stderr of test 'InsertWith2PCDeleteWithCommit-1` in directory 'sql/test/HTM` itself: - - -# 17:16:33 > -# 17:16:33 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38035" "--set" "mapi_usock=/var/tmp/mtest-1912/.s.monetdb.38035" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_HTM" "--set" "mal_listing=0" -# 17:16:33 > - -# builtin opt gdk_dbpath = /Users/dnedev/monetdb/installation/var/monetdb5/dbfarm/demo -# builtin opt gdk_debug = 0 -# builtin opt gdk_vmtrim = no -# builtin opt monet_prompt = > -# builtin opt monet_daemon = no -# builtin opt mapi_port = 50000 -# builtin opt mapi_open = false -# builtin opt mapi_autosense = false -# builtin opt sql_optimizer = default_pipe -# builtin opt sql_debug = 0 -# cmdline opt gdk_nr_threads = 0 -# cmdline opt mapi_open = true -# cmdline opt mapi_port = 38035 -# cmdline opt mapi_usock = /var/tmp/mtest-1912/.s.monetdb.38035 -# cmdline opt monet_prompt = -# cmdline opt mal_listing = 2 -# cmdline opt gdk_dbpath = /Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_HTM -# cmdline opt mal_listing = 0 -# cmdline opt gdk_debug = 536870922 - -# 17:16:33 > -# 17:16:33 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1912" "--port=38035" -# 17:16:33 > - - -# 17:16:33 > -# 17:16:33 > "Done." -# 17:16:33 > - diff --git a/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.out b/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.out --- a/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.out +++ b/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.out @@ -1,13 +1,13 @@ -stdout of test 'InsertWith2PCDeleteWithCommit-1` in directory 'sql/test/2-phase-commit` itself: +stdout of test 'InsertWith2PCDeleteWithCommit-1` in directory 'sql/test/HTM` itself: # 17:16:33 > -# 17:16:33 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38035" "--set" "mapi_usock=/var/tmp/mtest-1912/.s.monetdb.38035" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_2-phase-commit" "--set" "mal_listing=0" +# 17:16:33 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38035" "--set" "mapi_usock=/var/tmp/mtest-1912/.s.monetdb.38035" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_HTM" "--set" "mal_listing=0" # 17:16:33 > # MonetDB 5 server v11.22.0 # This is an unreleased version -# Serving database 'mTests_sql_test_2-phase-commit', using 4 threads +# Serving database 'mTests_sql_test_HTM', using 4 threads # Compiled for x86_64-apple-darwin14.3.0/64bit with 64bit OIDs and 128bit integers dynamically linked # Found 8.000 GiB available main-memory. # Copyright (c) 1993-July 2008 CWI. diff --git a/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.out-- b/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.out-- deleted file mode 100644 --- a/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-1.stable.out-- +++ /dev/null @@ -1,73 +0,0 @@ -stdout of test 'InsertWith2PCDeleteWithCommit-1` in directory 'sql/test/HTM` itself: - - -# 17:16:33 > -# 17:16:33 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38035" "--set" "mapi_usock=/var/tmp/mtest-1912/.s.monetdb.38035" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_HTM" "--set" "mal_listing=0" -# 17:16:33 > - -# MonetDB 5 server v11.22.0 -# This is an unreleased version -# Serving database 'mTests_sql_test_HTM', using 4 threads -# Compiled for x86_64-apple-darwin14.3.0/64bit with 64bit OIDs and 128bit integers dynamically linked -# Found 8.000 GiB available main-memory. -# Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved -# Visit http://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://MacBookAir.local:38035/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-1912/.s.monetdb.38035 -# Start processing logs sql/sql_logs version 52200 -# Start reading the write-ahead log 'sql_logs/sql/log.10' -# Finished reading the write-ahead log 'sql_logs/sql/log.10' -# Finished processing logs sql/sql_logs -# MonetDB/SQL module loaded - -Ready. - -# 17:16:33 > -# 17:16:33 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1912" "--port=38035" -# 17:16:33 > - -#START TRANSACTION; -#INSERT INTO htmtest VALUES (16, 99), (17, 99), (18, 99); -[ 3 ] -#SELECT * FROM htmtest; -% sys.htmtest, sys.htmtest # table_name -% id, val # name -% int, int # type -% 2, 2 # length -[ 1, 10 ] -[ 2, 20 ] -[ 3, 88 ] -[ 16, 99 ] -[ 17, 99 ] -[ 18, 99 ] -#CALL precommit(6); -[ 3 ] -#CALL persistcommit(6); -[ 3 ] -#SELECT * FROM htmtest; -% sys.htmtest, sys.htmtest # table_name -% id, val # name -% int, int # type -% 2, 2 # length -[ 1, 10 ] -[ 2, 20 ] -[ 3, 88 ] -[ 16, 99 ] -[ 17, 99 ] -[ 18, 99 ] -#DELETE FROM htmtest WHERE id > 3; -[ 3 ] -#SELECT * FROM htmtest; -% sys.htmtest, sys.htmtest # table_name -% id, val # name -% int, int # type -% 1, 2 # length -[ 1, 10 ] -[ 2, 20 ] -[ 3, 88 ] - -# 17:16:33 > -# 17:16:33 > "Done." -# 17:16:33 > - diff --git a/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.stable.err b/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.stable.err --- a/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.stable.err +++ b/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.stable.err @@ -1,8 +1,8 @@ -stderr of test 'InsertWith2PCDeleteWithCommit-2` in directory 'sql/test/2-phase-commit` itself: +stderr of test 'InsertWith2PCDeleteWithCommit-2` in directory 'sql/test/HTM` itself: # 17:16:34 > -# 17:16:34 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38035" "--set" "mapi_usock=/var/tmp/mtest-1912/.s.monetdb.38035" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_2-phase-commit" "--set" "mal_listing=0" +# 17:16:34 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38035" "--set" "mapi_usock=/var/tmp/mtest-1912/.s.monetdb.38035" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_HTM" "--set" "mal_listing=0" # 17:16:34 > # builtin opt gdk_dbpath = /Users/dnedev/monetdb/installation/var/monetdb5/dbfarm/demo @@ -21,7 +21,7 @@ stderr of test 'InsertWith2PCDeleteWithC # cmdline opt mapi_usock = /var/tmp/mtest-1912/.s.monetdb.38035 # cmdline opt monet_prompt = # cmdline opt mal_listing = 2 -# cmdline opt gdk_dbpath = /Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_2-phase-commit +# cmdline opt gdk_dbpath = /Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_HTM # cmdline opt mal_listing = 0 # cmdline opt gdk_debug = 536870922 diff --git a/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.stable.err-- b/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.stable.err-- deleted file mode 100644 --- a/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.stable.err-- +++ /dev/null @@ -1,36 +0,0 @@ -stderr of test 'InsertWith2PCDeleteWithCommit-2` in directory 'sql/test/HTM` itself: - - -# 17:16:34 > -# 17:16:34 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38035" "--set" "mapi_usock=/var/tmp/mtest-1912/.s.monetdb.38035" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_HTM" "--set" "mal_listing=0" -# 17:16:34 > - -# builtin opt gdk_dbpath = /Users/dnedev/monetdb/installation/var/monetdb5/dbfarm/demo -# builtin opt gdk_debug = 0 -# builtin opt gdk_vmtrim = no -# builtin opt monet_prompt = > -# builtin opt monet_daemon = no -# builtin opt mapi_port = 50000 -# builtin opt mapi_open = false -# builtin opt mapi_autosense = false -# builtin opt sql_optimizer = default_pipe -# builtin opt sql_debug = 0 -# cmdline opt gdk_nr_threads = 0 -# cmdline opt mapi_open = true -# cmdline opt mapi_port = 38035 -# cmdline opt mapi_usock = /var/tmp/mtest-1912/.s.monetdb.38035 -# cmdline opt monet_prompt = -# cmdline opt mal_listing = 2 -# cmdline opt gdk_dbpath = /Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_HTM -# cmdline opt mal_listing = 0 -# cmdline opt gdk_debug = 536870922 - -# 17:16:34 > -# 17:16:34 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1912" "--port=38035" -# 17:16:34 > - - -# 17:16:34 > -# 17:16:34 > "Done." -# 17:16:34 > - diff --git a/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.stable.out b/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.stable.out --- a/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.stable.out +++ b/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.stable.out @@ -1,13 +1,13 @@ -stdout of test 'InsertWith2PCDeleteWithCommit-2` in directory 'sql/test/2-phase-commit` itself: +stdout of test 'InsertWith2PCDeleteWithCommit-2` in directory 'sql/test/HTM` itself: # 17:16:34 > -# 17:16:34 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38035" "--set" "mapi_usock=/var/tmp/mtest-1912/.s.monetdb.38035" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_2-phase-commit" "--set" "mal_listing=0" +# 17:16:34 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38035" "--set" "mapi_usock=/var/tmp/mtest-1912/.s.monetdb.38035" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_HTM" "--set" "mal_listing=0" # 17:16:34 > # MonetDB 5 server v11.22.0 # This is an unreleased version -# Serving database 'mTests_sql_test_2-phase-commit', using 4 threads +# Serving database 'mTests_sql_test_HTM', using 4 threads # Compiled for x86_64-apple-darwin14.3.0/64bit with 64bit OIDs and 128bit integers dynamically linked # Found 8.000 GiB available main-memory. # Copyright (c) 1993-July 2008 CWI. diff --git a/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.stable.out-- b/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.stable.out-- deleted file mode 100644 --- a/sql/test/2-phase-commit/Tests/InsertWith2PCDeleteWithCommit-2.stable.out-- +++ /dev/null @@ -1,42 +0,0 @@ -stdout of test 'InsertWith2PCDeleteWithCommit-2` in directory 'sql/test/HTM` itself: - - -# 17:16:34 > -# 17:16:34 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=38035" "--set" "mapi_usock=/var/tmp/mtest-1912/.s.monetdb.38035" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/Users/dnedev/monetdb/installation/var/MonetDB/mTests_sql_test_HTM" "--set" "mal_listing=0" -# 17:16:34 > - -# MonetDB 5 server v11.22.0 -# This is an unreleased version -# Serving database 'mTests_sql_test_HTM', using 4 threads -# Compiled for x86_64-apple-darwin14.3.0/64bit with 64bit OIDs and 128bit integers dynamically linked -# Found 8.000 GiB available main-memory. -# Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved -# Visit http://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://MacBookAir.local:38035/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-1912/.s.monetdb.38035 -# Start processing logs sql/sql_logs version 52200 -# Start reading the write-ahead log 'sql_logs/sql/log.10' -# Finished reading the write-ahead log 'sql_logs/sql/log.10' -# Finished processing logs sql/sql_logs -# MonetDB/SQL module loaded - -Ready. - -# 17:16:34 > -# 17:16:34 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-1912" "--port=38035" -# 17:16:34 > - -#SELECT * FROM htmtest; -% sys.htmtest, sys.htmtest # table_name -% id, val # name -% int, int # type -% 1, 2 # length -[ 1, 10 ] -[ 2, 20 ] -[ 3, 88 ] - -# 17:16:34 > -# 17:16:34 > "Done." -# 17:16:34 > - diff --git a/sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-1.stable.err b/sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-1.stable.err --- a/sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-1.stable.err +++ b/sql/test/2-phase-commit/Tests/InsertWithCommitDeleteWith2PC-1.stable.err @@ -1,8 +1,8 @@ -stderr of test 'InsertWithCommitDeleteWith2PC-1` in directory 'sql/test/2-phase-commit` itself: +stderr of test 'InsertWithCommitDeleteWith2PC-1` in directory 'sql/test/HTM` itself: _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
