Update of /cvsroot/monetdb/sql/src/test/Dependencies/Tests
In directory 
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv9464/src/test/Dependencies/Tests

Modified Files:
        Dependencies.stable.out 
Log Message:
propagated changes of Thursday Jun 28 2007 - Sunday Jul 01 2007
from the SQL_2-18 branch to the development trunk

NOTE:

I hope, I resolved the conflicts in 

        src/backends/monet4/sql_server.mx
        src/backends/monet5/sql.mx
        src/backends/monet5/sql_optimizer.mx
        src/test/Dependencies/Tests/Dependencies.stable.out

correctly --- please double-check!



Index: Dependencies.stable.out
===================================================================
RCS file: 
/cvsroot/monetdb/sql/src/test/Dependencies/Tests/Dependencies.stable.out,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Dependencies.stable.out     29 Jun 2007 11:29:28 -0000      1.8
+++ Dependencies.stable.out     1 Jul 2007 14:34:38 -0000       1.9
@@ -1,11 +1,11 @@
 stdout of test 'Dependencies` in directory 'src/test/Dependencies` itself:
 
 
-# 08:24:17 >  
-# 08:24:17 >  Mtimeout -timeout 180  Mserver 
"--config=/ufs/niels/scratch/monetdb/Linux-x86_64/etc/MonetDB.conf" --debug=10 
--set 
"monet_mod_path=/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB4:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB4/lib:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB4/bin"
 --set "gdk_dbfarm=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB4/dbfarm" 
--set 
"sql_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB4/sql_logs" 
--set 
"xquery_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB4/xquery_logs"
 --set mapi_open=true --set mapi_port=34067 --set xrpc_port=43036 --set 
monet_prompt= --trace "--dbname=mTests_src_test_Dependencies" --dbinit=" 
module(sql_server);" ; echo ; echo Over..
-# 08:24:17 >  
+# 15:33:56 >  
+# 15:33:56 >  Mtimeout -timeout 180  Mserver 
"--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/MonetDB.conf" --debug=10 --set 
"monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB4:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB4/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB4/bin"
 --set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB4/dbfarm" 
--set "sql_logdir=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB4/sql_logs" 
--set 
"xquery_logdir=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB4/xquery_logs" 
--set mapi_open=true --set mapi_port=39240 --set xrpc_port=48885 --set 
monet_prompt= --trace "--dbname=mTests_src_test_Dependencies" --dbinit=" 
module(sql_server);" ; echo ; echo Over..
+# 15:33:56 >  
 
-# Monet Database Server V4.17.1
+# Monet Database Server V4.18.0
 # Copyright (c) 1993-2007, CWI. All rights reserved.
 # Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs; dynamically 
linked.
 # Visit http://monetdb.cwi.nl/ for further information.


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to