Changeset: 22c6c9ca8b9d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=22c6c9ca8b9d
Modified Files:
        
sql/test/BugDay_2005-10-06_2.9.3/Tests/rollback_and_autocommit.SF-926453.stable.err
Branch: Aug2011
Log Message:

Reapprove error output.
Diff on some platforms seems to have difficulty seeing that all
differences that exist between the old stable output and the test
output were to be ignored.


diffs (123 lines):

diff --git 
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/rollback_and_autocommit.SF-926453.stable.err
 
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/rollback_and_autocommit.SF-926453.stable.err
--- 
a/sql/test/BugDay_2005-10-06_2.9.3/Tests/rollback_and_autocommit.SF-926453.stable.err
+++ 
b/sql/test/BugDay_2005-10-06_2.9.3/Tests/rollback_and_autocommit.SF-926453.stable.err
@@ -1,104 +1,35 @@
 stderr of test 'rollback_and_autocommit.SF-926453` in directory 
'test/BugDay_2005-10-06_2.9.3` itself:
 
 
-# 19:22:48 >  
-# 19:22:48 >   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=32644 --set 
xrpc_port=42482 --set monet_prompt= --trace  
"--dbname=mTests_src_test_BugDay_2005-10-06_2.9.3" --set mal_listing=0 
"--dbinit= include sql;" ; echo ; echo Over..
-# 19:22:48 >  
+# 15:32:14 >  
+# 15:32:14 >  "mserver5" "--debug=0" "--set" "gdk_nr_threads=0" "--set" 
"gdk_dbfarm=/ufs/sjoerd/Monet-candidate/var/MonetDB" "--set" "mapi_open=true" 
"--set" "mapi_port=30558" "--set" "monet_prompt=" "--trace" "--forcemito" 
"--set" "mal_listing=2" "--dbname=mTests_test_BugDay_2005-10-06_2.9.3" "--set" 
"mal_listing=0"
+# 15:32:14 >  
 
-# builtin opt  gdk_arch = 64bitx86_64-unknown-linux-gnu
-# builtin opt  gdk_version = 1.27.0
-# builtin opt  monet_pid = 26474
-# 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 = 32644
-# cmdline opt  xrpc_port = 42482
-# cmdline opt  monet_prompt = 
-# cmdline opt  gdk_dbname = mTests_src_test_BugDay_2005-10-06_2.9.3
-# 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)
 
-# 19:22:48 >  
-# 19:22:48 >  mclient -lsql -umonetdb -Pmonetdb --host=alf --port=32644 
-# 19:22:48 >  
+# 15:32:14 >  
+# 15:32:14 >  "mclient" "-lsql" "-ftest" "-i" "-e" "--host=ottar" 
"--port=30558"
+# 15:32:14 >  
 
-MAPI  = monetdb@alf:32644
+MAPI  = monetdb@ottar:30558
 QUERY = select count(*) from tapestry where attr2<0;
 ERROR = !SELECT: no such table 'tapestry'
-MAPI  = monetdb@alf:32644
+MAPI  = monetdb@ottar:30558
 QUERY = select count(*) from tapestry where attr2<0;
 ERROR = !SELECT: no such table 'tapestry'
-MAPI  = monetdb@alf:32644
+MAPI  = monetdb@ottar:30558
 QUERY = select count(*) from tapestry where attr2<0;
 ERROR = !SELECT: no such table 'tapestry'
-MAPI  = monetdb@alf:32644
+MAPI  = monetdb@ottar:30558
 QUERY = select count(*) from tapestry where attr2<0;
 ERROR = !SELECT: no such table 'tapestry'
-MAPI  = monetdb@alf:32644
+MAPI  = monetdb@ottar:30558
 QUERY = select count(*) from tapestry where attr2<0;
 ERROR = !SELECT: no such table 'tapestry'
-MAPI  = monetdb@alf:32644
+MAPI  = monetdb@ottar:30558
 QUERY = select count(*) from tapestry where attr2<0;
 ERROR = !SELECT: no such table 'tapestry'
 
-# 19:22:48 >  
-# 19:22:48 >  Done.
-# 19:22:48 >  
+# 15:32:14 >  
+# 15:32:14 >  "Done."
+# 15:32:14 >  
 
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to