Update of /cvsroot/monetdb/sql/src/test/Connections/Tests
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4349

Modified Files:
      Tag: Nov2009
        connections.stable.err connections.stable.out 
Log Message:
Correct the err output for a new error message:
ERROR = !IOException:mapi.connect:Could not connect: initiating connection on 
socket failed: Connection refused

This comes from the fix from Fabian:
[Monetdb-checkins] MonetDB5/src/modules/mal mal_mapi.mx, Nov2009,       
1.37.2.9, 1.37.2.10

Log Message:
don't destroy before we use the error string,

The test out and err output are old, lets clean them and sync with the actual 
version of mclient and mserver5

Connections test is now Green


Index: connections.stable.out
===================================================================
RCS file: 
/cvsroot/monetdb/sql/src/test/Connections/Tests/connections.stable.out,v
retrieving revision 1.1
retrieving revision 1.1.20.1
diff -u -d -r1.1 -r1.1.20.1
--- connections.stable.out      26 Mar 2007 11:00:16 -0000      1.1
+++ connections.stable.out      11 Nov 2009 15:57:41 -0000      1.1.20.1
@@ -6,23 +6,25 @@
 # 12:08:28 >  
 
 
-server 11 : "include sql;"
-!WARNING: GDKlockHome: ignoring empty or invalid .gdk_lock.
-!WARNING: BBPdir: initializing BBP.
-# MonetDB Server v5.0.0_beta2_1
-# Copyright (c) 1993-2007 CWI, all rights reserved
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
-# dbname:mTests_src_test_Connections
+server 11
+# MonetDB server v5.16.0, based on kernel v1.34.0
+# Serving database 'mTests_src_test_Connections', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically 
linked
+# Detected 7.753 GiB (8324386816 bytes) main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2009 MonetDB B.V., all rights reserved
 # Visit http://monetdb.cwi.nl/ for further information
 
-server 12 : "include sql;"
-# MonetDB Server v5.0.0_beta2_1
-# Copyright (c) 1993-2007 CWI, all rights reserved
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
-# dbname:mTests_src_test_Connections_test1
+server 12
+# MonetDB server v5.16.0, based on kernel v1.34.0
+# Serving database 'mTests_src_test_Connections_test1', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically 
linked
+# Detected 7.753 GiB (8324386816 bytes) main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2009 MonetDB B.V., all rights reserved
 # Visit http://monetdb.cwi.nl/ for further information
 
-server 12 : "include sql;", client 1: SQL
+server 12, client 1
 % sys.connections,     sys.connections,        sys.connections,        
sys.connections # table_name
 % server,      db,     db_alias,       language # name
 % char,        char,   char,   char # type
@@ -44,7 +46,7 @@
 % char,        char,   char,   char # type
 % 1024,        64,     1024,   1024 # length
 
-server 12 : "include sql;", client 2: SQL
+server 12, client 2
 % sys.connections,     sys.connections,        sys.connections,        
sys.connections # table_name
 % server,      db,     db_alias,       language # name
 % char,        char,   char,   char # type
@@ -69,7 +71,7 @@
 % char,        char,   char,   char # type
 % 1024,        64,     1024,   1024 # length
 
-server 12 : "include sql;", client 3: SQL
+server 12, client 3
 % sys.connections,     sys.connections,        sys.connections,        
sys.connections # table_name
 % server,      db,     db_alias,       language # name
 % char,        char,   char,   char # type

Index: connections.stable.err
===================================================================
RCS file: 
/cvsroot/monetdb/sql/src/test/Connections/Tests/connections.stable.err,v
retrieving revision 1.8
retrieving revision 1.8.8.1
diff -u -d -r1.8 -r1.8.8.1
--- connections.stable.err      15 Dec 2008 18:16:41 -0000      1.8
+++ connections.stable.err      11 Nov 2009 15:57:41 -0000      1.8.8.1
@@ -6,8 +6,8 @@
 # 17:56:44 >  
 
 
-server 11 : "include sql;"
-#mserver: "Mtimeout -timeout 60  mserver5 
"--config=/ufs/goncalve/scratch/MonetDB/current/debug/MonetDB5/etc/monetdb5.conf"
 --debug=10 --set gdk_nr_threads=0 --set 
"monet_mod_path=/ufs/goncalve/scratch/MonetDB/current/debug/MonetDB5//lib/MonetDB5:/ufs/goncalve/scratch/MonetDB/current/debug/MonetDB5//lib/MonetDB5/lib:/ufs/goncalve/scratch/MonetDB/current/debug/MonetDB5//lib/MonetDB5/bin"
 --set 
"gdk_dbfarm=/ufs/goncalve/scratch/MonetDB/current/debug/MonetDB5//var/MonetDB5/dbfarm"
 --set 
"sql_logdir=/ufs/goncalve/scratch/MonetDB/current/debug/MonetDB5//var/MonetDB5/sql_logs"
  --set mapi_open=true --set xrpc_open=true --set mapi_port=31973 --set 
xrpc_port=46571 --set monet_prompt= --trace  --dbfarm 
"/ufs/goncalve/scratch/MonetDB/current/debug/MonetDB5//var/MonetDB5/dbfarm" 
--dbname "mTests_src_test_Connections" --dbinit="include sql;""
+server 11
+#mserver
 # builtin opt  gdk_arch = 64bitx86_64-unknown-linux-gnu
 # builtin opt  gdk_version = 1.27.0
 # builtin opt  monet_pid = 6194
@@ -78,8 +78,8 @@
 #warning: please don't forget to set your vault key!
 #(see /ufs/goncalve/scratch/MonetDB/current/debug/MonetDB5/etc/monetdb5.conf)
 
-server 12 : "include sql;"
-#remote mserver: "Mtimeout -timeout 60  mserver5 
"--config=/ufs/goncalve/scratch/MonetDB/current/debug/MonetDB5/etc/monetdb5.conf"
 --debug=10 --set gdk_nr_threads=0 --set 
"monet_mod_path=/ufs/goncalve/scratch/MonetDB/current/debug/MonetDB5//lib/MonetDB5:/ufs/goncalve/scratch/MonetDB/current/debug/MonetDB5//lib/MonetDB5/lib:/ufs/goncalve/scratch/MonetDB/current/debug/MonetDB5//lib/MonetDB5/bin"
 --set 
"gdk_dbfarm=/ufs/goncalve/scratch/MonetDB/current/debug/MonetDB5//var/MonetDB5/dbfarm"
 --set 
"sql_logdir=/ufs/goncalve/scratch/MonetDB/current/debug/MonetDB5//var/MonetDB5/sql_logs"
  --set mapi_open=true --set xrpc_open=true --set mapi_port=31974 --set 
xrpc_port=46571 --set monet_prompt= --trace  --dbfarm 
"/ufs/goncalve/scratch/MonetDB/current/debug/MonetDB5//var/MonetDB5/dbfarm" 
--dbname "mTests_src_test_Connections_test1" --dbinit="include sql;""
+server 12
+#remote mserver
 # builtin opt  gdk_arch = 64bitx86_64-unknown-linux-gnu
 # builtin opt  gdk_version = 1.27.0
 # builtin opt  monet_pid = 6199
@@ -150,50 +150,50 @@
 #warning: please don't forget to set your vault key!
 #(see /ufs/goncalve/scratch/MonetDB/current/debug/MonetDB5/etc/monetdb5.conf)
 
-server 12 : "include sql;", client 1: SQL
-#client1: "Mtimeout -timeout 60 mclient -lsql -umonetdb -Pmonetdb --host=alf 
--port=35778 "
-MAPI  = mone...@alf:35778
+server 12, client 1
+#client1
+MAPI  = mone...@alviss:32496
 QUERY = connect to 'localhost' port 34 database 
'mTests_src_test_Connections_test1' as 'test_db_1' user 'monetdb' password 
'monetdb' language 'sql';
-ERROR = !IOException:mapi.connect:Could not connect: Setup connection failed
-MAPI  = mone...@alf:35778
-QUERY = connect to 'localhost' port 35779 database 
'mTests_src_test_Connections_test1' as 'test_db_1' language 'sql';
-ERROR = !syntax error, unexpected LANGUAGE, expecting USER in: "connect to 
'localhost' port 35779 database 'mTests_src_test_Connections_test1' as 
'test_db_1' language"
-MAPI  = mone...@alf:35778
+ERROR = !IOException:mapi.connect:Could not connect: initiating connection on 
socket failed: Connection refused
+MAPI  = mone...@alviss:32496
+QUERY = connect to 'localhost' port 32497 database 
'mTests_src_test_Connections_test1' as 'test_db_1' language 'sql';
+ERROR = !syntax error, unexpected LANGUAGE, expecting USER in: "connect to 
'localhost' port 32497 database 'mTests_src_test_Connections_test1' as 
'test_db_1' language"
+MAPI  = mone...@alviss:32496
 QUERY = connect to 'localhost' database 'mTests_src_test_Connections_test1';
 ERROR = !syntax error, unexpected SCOLON, expecting USER in: "connect to 
'localhost' database 'mTests_src_test_Connections_test1';"
-MAPI  = mone...@alf:35778
-QUERY = connect 'localhost' port 35779 database 
'mTests_src_test_Connections_test1' as 'test_db_1' user 'monetdb' password 
'monetdb' language 'sql';
+MAPI  = mone...@alviss:32496
+QUERY = connect 'localhost' port 32497 database 
'mTests_src_test_Connections_test1' as 'test_db_1' user 'monetdb' password 
'monetdb' language 'sql';
 ERROR = !syntax error, unexpected STRING, expecting TO in: "connect 
'localhost'"
-MAPI  = mone...@alf:35778
-QUERY = connect to 'localhost' port 35779 as 'test_db_1' user 'monetdb' 
password 'monetdb' language 'sql';
-ERROR = !syntax error, unexpected AS, expecting DATABASE in: "connect to 
'localhost' port 35779 as"
-MAPI  = mone...@alf:35778
-QUERY = connect to 'localhost' port 35779 database 
'mTests_src_test_Connections_test1' as 'test_db' user 'monetdb' language 'sql';
-ERROR = !syntax error, unexpected LANGUAGE, expecting PASSWORD in: "connect to 
'localhost' port 35779 database 'mTests_src_test_Connections_test1' as 
'test_db' user 'monetdb' language"
-MAPI  = mone...@alf:35778
+MAPI  = mone...@alviss:32496
+QUERY = connect to 'localhost' port 32497 as 'test_db_1' user 'monetdb' 
password 'monetdb' language 'sql';
+ERROR = !syntax error, unexpected AS, expecting DATABASE in: "connect to 
'localhost' port 32497 as"
+MAPI  = mone...@alviss:32496
+QUERY = connect to 'localhost' port 32497 database 
'mTests_src_test_Connections_test1' as 'test_db' user 'monetdb' language 'sql';
+ERROR = !syntax error, unexpected LANGUAGE, expecting PASSWORD in: "connect to 
'localhost' port 32497 database 'mTests_src_test_Connections_test1' as 
'test_db' user 'monetdb' language"
+MAPI  = mone...@alviss:32496
 QUERY = disconnect 'test_db_1';
 ERROR = !DISCONNECT CATALOG: no such db_alias 'test_db_1'
 
-server 12 : "include sql;", client 2: SQL
-#client1: "Mtimeout -timeout 60 mclient -lsql -umonetdb -Pmonetdb --host=alf 
--port=35778 "
-MAPI  = mone...@alf:35778
-QUERY = connect to 'localhost' port 357795 database 
'mTests_src_test_Connections_test1' as 'test_db' user 'monetdb' password 
'monetdb' language 'sql';
+server 12, client 2
+#client1
+MAPI  = mone...@alviss:32496
+QUERY = connect to 'localhost' port 32498 database 
'mTests_src_test_Connections_test1' as 'test_db' user 'monetdb' password 
'monetdb' language 'sql';
 ERROR = !CONNECT TO: this connection already exists or the db_alias 'test_db' 
was already used!
-MAPI  = mone...@alf:35778
-QUERY = connect to 'localhost' port 35779 database 
'mTests_src_test_Connections_test1' as 'test' user 'monetdb' password 'monetdb' 
language 'sql';
+MAPI  = mone...@alviss:32496
+QUERY = connect to 'localhost' port 32497 database 
'mTests_src_test_Connections_test1' as 'test' user 'monetdb' password 'monetdb' 
language 'sql';
 ERROR = !CONNECT TO: this connection already exists or the db_alias 'test' was 
already used!
-MAPI  = mone...@alf:35778
+MAPI  = mone...@alviss:32496
 QUERY = connect to 'localhost' port 4000 database 'dmo' as 'test_db' user 
'monetdb' password 'monetdb' language 'sql';
 ERROR = !CONNECT TO: this connection already exists or the db_alias 'test_db' 
was already used!
-MAPI  = mone...@alf:35778
+MAPI  = mone...@alviss:32496
 QUERY = disconnect 'test_db';
 ERROR = !DISCONNECT CATALOG: no such db_alias 'test_db'
-MAPI  = mone...@alf:35778
+MAPI  = mone...@alviss:32496
 QUERY = disconnect 'test_tb';
 ERROR = !DISCONNECT CATALOG: no such db_alias 'test_tb'
 
-server 12 : "include sql;", client 3: SQL
-#client1: "Mtimeout -timeout 60 mclient -lsql -umonetdb -Pmonetdb 
--host=alviss --port=31973 "
+server 12, client 3
+#client1
 
 # 17:56:55 >  
 # 17:56:55 >  Done.


------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to