Changeset: 545c73ab85b5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=545c73ab85b5 Removed Files: sql/test/Tests/coalesce.stable.err.single Branch: geo Log Message:
Merge with default branch. diffs (91 lines): diff --git a/sql/test/Tests/coalesce.stable.err.single b/sql/test/Tests/coalesce.stable.err.single deleted file mode 100644 --- a/sql/test/Tests/coalesce.stable.err.single +++ /dev/null @@ -1,86 +0,0 @@ -stderr of test 'coalesce` in directory 'sql/test` itself: - - -# 20:30:43 > -# 20:30:43 > mserver5 "--config=/ufs/niels/scratch/monetdb/Linux-x86_64/etc/monetdb5.conf" --debug=10 --set gdk_nr_threads=4 --set "monet_mod_path=/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/sql_logs" --set mapi_open=true --set xrpc_open=true --set mapi_port=39627 --set xrpc_port=43642 --set monet_prompt= --trace "--dbname=mTests_src_test" --set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over.. -# 20:30:43 > - -# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu -# builtin opt gdk_version = 1.27.0 -# builtin opt monet_pid = 24322 -# builtin opt prefix = /ufs/niels/scratch/monetdb/Linux-x86_64 -# builtin opt exec_prefix = ${prefix} -# builtin opt gdk_dbname = tst -# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB -# builtin opt gdk_debug = 8 -# builtin opt gdk_mem_bigsize = 262144 -# builtin opt gdk_alloc_map = yes -# builtin opt gdk_mem_pagebits = 14 -# builtin opt gdk_vmtrim = yes -# builtin opt monet_admin = adm -# builtin opt monet_prompt = > -# builtin opt monet_welcome = yes -# builtin opt monet_mod_path = ${exec_prefix}/lib/MonetDB:${exec_prefix}/lib/bin -# builtin opt monet_daemon = yes -# builtin opt host = localhost -# builtin opt mapi_port = 50000 -# builtin opt mapi_noheaders = no -# builtin opt mapi_debug = 0 -# builtin opt mapi_clients = 2 -# builtin opt sql_debug = 0 -# builtin opt sql_logdir = ${prefix}/var/MonetDB -# builtin opt xquery_logdir = ${prefix}/var/MonetDB -# builtin opt standoff_ns = http://monetdb.cwi.nl/standoff -# builtin opt standoff_start = start -# builtin opt standoff_end = end -# config opt prefix = /ufs/niels/scratch/monetdb/Linux-x86_64 -# config opt config = ${prefix}/etc/monetdb5.conf -# config opt prefix = /ufs/niels/scratch/monetdb/Linux-x86_64 -# config opt exec_prefix = ${prefix} -# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm -# config opt gdk_dbname = demo -# config opt gdk_alloc_map = no -# config opt gdk_embedded = no -# config opt gdk_debug = 0 -# config opt monet_mod_path = ${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/lib/MonetDB5/bin -# config opt monet_daemon = no -# config opt monet_welcome = yes -# config opt mero_msglog = ${prefix}/var/log/merovingian.log -# config opt mero_errlog = ${prefix}/var/log/merovingian.log -# config opt mero_timeinterval = 600 -# config opt mero_pidfile = ${prefix}/var/run/merovingian.pid -# config opt mero_exittimeout = 7 -# config opt mero_doproxy = yes -# config opt mero_discoveryttl = 600 -# config opt mal_init = ${exec_prefix}/lib/MonetDB5/mal_init.mal -# config opt mal_listing = 2 -# config opt checkpoint_dir = ${prefix}/var/MonetDB5/chkpnt -# config opt mapi_port = 50000 -# config opt mapi_open = false -# config opt sql_logdir = ${prefix}/var/MonetDB5/sql_logs -# config opt sql_init = ${exec_prefix}/lib/MonetDB5/sql_init.sql -# cmdline opt config = /ufs/niels/scratch/monetdb/Linux-x86_64/etc/monetdb5.conf -# cmdline opt gdk_nr_threads = 4 -# cmdline opt monet_mod_path = /ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/bin -# cmdline opt gdk_dbfarm = /ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/dbfarm -# cmdline opt sql_logdir = /ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/sql_logs -# cmdline opt mapi_open = true -# cmdline opt xrpc_open = true -# cmdline opt mapi_port = 39627 -# cmdline opt xrpc_port = 43642 -# cmdline opt monet_prompt = -# cmdline opt gdk_dbname = mTests_src_test -# cmdline opt mal_listing = 0 -# cmdline opt gdk_debug = 10 -#warning: please don't forget to set your vault key! -#(see /ufs/niels/scratch/monetdb/Linux-x86_64/etc/monetdb5.conf) - -# 20:30:43 > -# 20:30:43 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=39627 -# 20:30:43 > - - -# 20:30:44 > -# 20:30:44 > Done. -# 20:30:44 > - _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list