Update of /cvsroot/monetdb/sql/src/test/BugDay_2005-12-19_2.9.3/Tests
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv21290/Tests

Modified Files:
        select_from_env.SF-1240701.1242164.stable.err 
        select_from_env.SF-1240701.1242164.stable.out 
Log Message:
approve after addition of new merovingian variable

U select_from_env.SF-1240701.1242164.stable.out
Index: select_from_env.SF-1240701.1242164.stable.out
===================================================================
RCS file: 
/cvsroot/monetdb/sql/src/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- select_from_env.SF-1240701.1242164.stable.out       14 Aug 2009 12:50:33 
-0000      1.31
+++ select_from_env.SF-1240701.1242164.stable.out       24 Sep 2009 06:22:36 
-0000      1.32
@@ -62,6 +62,7 @@
 [ "mero_msglog"        ]
 [ "mero_errlog"        ]
 [ "mero_pidfile"       ]
+[ "mero_controlport"   ]
 [ "mal_init"   ]
 [ "mapi_autosense"     ]
 [ "sql_optimizer"      ]

U select_from_env.SF-1240701.1242164.stable.err
Index: select_from_env.SF-1240701.1242164.stable.err
===================================================================
RCS file: 
/cvsroot/monetdb/sql/src/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- select_from_env.SF-1240701.1242164.stable.err       14 Aug 2009 12:50:26 
-0000      1.26
+++ select_from_env.SF-1240701.1242164.stable.err       24 Sep 2009 06:22:36 
-0000      1.27
@@ -5,9 +5,72 @@
 # 13:22:15 >  Mtimeout -timeout 180 Mserver 
"--config=/ufs/sjoerd/Monet-virgin/etc/MonetDB.conf" --debug=10 --set 
"monet_mod_path=/ufs/sjoerd/src/MonetDB/devel/sql-virgin/Linux/lib/MonetDB:/ufs/sjoerd/Monet-virgin/lib/MonetDB"
 --set "gdk_dbfarm=/ufs/sjoerd/Monet-virgin/var/MonetDB/dbfarm" --set 
"sql_logdir=/ufs/sjoerd/Monet-virgin/var/MonetDB/log" --set mapi_port=30620 
--set sql_port=47090 --set xquery_port=50410 --set monet_prompt= --trace 
"--dbname=mTests_src_test_BugDay_2005-12-19_2.9.3" 
--dbinit="module(sql_server); sql_server_start();" ; echo ; echo Over..
 # 13:22:15 >  
 
-MAPI  = mone...@alf:37388
+# builtin opt  gdk_arch = 64bitx86_64-pc-solaris2.11
+# builtin opt  gdk_version = 1.33.0
+# builtin opt  prefix = 
/export/scratch/stripe/fabian/monetdb/current/program-i86pc
+# 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_alloc_map = yes
+# builtin opt  gdk_vmtrim = yes
+# builtin opt  monet_admin = adm
+# builtin opt  monet_prompt = >
+# builtin opt  monet_welcome = yes
+# builtin opt  monet_mod_path = 
/export/scratch/stripe/fabian/monetdb/current/program-i86pc/lib/MonetDB
+# 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  standoff_ns = http://monetdb.cwi.nl/standoff
+# builtin opt  standoff_start = start
+# builtin opt  standoff_end = end
+# config opt   prefix = 
/export/scratch/stripe/fabian/monetdb/current/program-i86pc
+# config opt   config = ${prefix}/etc/monetdb5.conf
+# config opt   prefix = 
/export/scratch/stripe/fabian/monetdb/current/program-i86pc
+# 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 = 
/export/scratch/stripe/fabian/monetdb/current/program-i86pc/lib/MonetDB5:/export/scratch/stripe/fabian/monetdb/current/program-i86pc/lib/MonetDB5/lib:/export/scratch/stripe/fabian/monetdb/current/program-i86pc/lib/MonetDB5/bin
+# config opt   monet_daemon = no
+# config opt   monet_welcome = yes
+# config opt   mero_msglog = ${prefix}/var/log/MonetDB/merovingian.log
+# config opt   mero_errlog = ${prefix}/var/log/MonetDB/merovingian.log
+# config opt   mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
+# config opt   mero_controlport = 50001
+# config opt   mal_init = 
/export/scratch/stripe/fabian/monetdb/current/program-i86pc/lib/MonetDB5/mal_init.mal
+# config opt   mal_listing = 2
+# config opt   mapi_port = 50000
+# config opt   mapi_autosense = false
+# config opt   mapi_open = false
+# config opt   sql_optimizer = 
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,replication,multiplex
+# cmdline opt  config = 
/export/scratch/stripe/fabian/monetdb/current/program-i86pc/etc/monetdb5.conf
+# cmdline opt  gdk_nr_threads = 0
+# cmdline opt  monet_mod_path = 
/export/scratch/stripe/fabian/monetdb/current/program-i86pc/lib/MonetDB5:/export/scratch/stripe/fabian/monetdb/current/program-i86pc/lib/MonetDB5/lib:/export/scratch/stripe/fabian/monetdb/current/program-i86pc/lib/MonetDB5/bin
+# cmdline opt  gdk_dbfarm = 
/export/scratch/stripe/fabian/monetdb/current/mtest-pegasus.ins.cwi.nl/sql/dbfarm
+# cmdline opt  mapi_open = true
+# cmdline opt  xrpc_open = true
+# cmdline opt  mapi_port = 30332
+# cmdline opt  xrpc_port = 44644
+# cmdline opt  monet_prompt = 
+# cmdline opt  gdk_dbname = mTests_src_test_BugDay_2005-12-19_2.9.3
+# cmdline opt  mal_listing = 0
+#warning: please don't forget to set your vault key!
+#(see 
/export/scratch/stripe/fabian/monetdb/current/program-i86pc/etc/monetdb5.conf)
+
+# 22:29:10 >  
+# 22:29:10 >  mclient -lsql -i -umonetdb -Pmonetdb --host=pegasus --port=30332 
+# 22:29:10 >  
+
+MAPI  = mone...@pegasus:30332
 QUERY = select * from env() as env where name = ( select 'prefix' from env() 
as env );
-ERROR = !SQLException:zero_or_one:cardinality violation (40>1)
+ERROR = !SQLException:zero_or_one:cardinality violation (41>1)
 
 
 # 13:22:15 >  


------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to