Update of /cvsroot/monetdb/sql/src/test/bugs/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17226/src/test/bugs/Tests
Modified Files:
profile_bug-SF.1314649.sql profile_bug-SF.1314649.stable.out
savepoint_rollback-bug-sf-953553.stable.err
simple_view.stable.out simple_view.stable.out.Five
Log Message:
removed 'explain' variable, ie no more set explain etc
but always use the statement modifiers debug, explain, profile
profile now only outputs the real, user and clk ticks per sec.
The old profile functionality is taken over by a new statement modifier
'record'
U simple_view.stable.out.Five
Index: simple_view.stable.out.Five
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/bugs/Tests/simple_view.stable.out.Five,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- simple_view.stable.out.Five 5 Sep 2007 08:27:25 -0000 1.4
+++ simple_view.stable.out.Five 1 Apr 2008 17:05:19 -0000 1.5
@@ -49,7 +49,7 @@
[ "user_role", "str", 1 ]
[ "auths", "str", 1 ]
[ "privileges", "str", 1 ]
-[ "profile", "str", 1 ]
+[ "history", "str", 1 ]
[ "test_update", "str", 1 ]
[ " ", "str", 1 ]
[ "pwprijs", "str", 1 ]
U simple_view.stable.out
Index: simple_view.stable.out
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/bugs/Tests/simple_view.stable.out,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- simple_view.stable.out 5 Sep 2007 08:27:25 -0000 1.4
+++ simple_view.stable.out 1 Apr 2008 17:05:17 -0000 1.5
@@ -51,7 +51,7 @@
[ "user_role", "str", 1 ]
[ "auths", "str", 1 ]
[ "privileges", "str", 1 ]
-[ "profile", "str", 1 ]
+[ "history", "str", 1 ]
[ "test_update", "str", 1 ]
[ " ", "str", 1 ]
[ "pwprijs", "str", 1 ]
U profile_bug-SF.1314649.stable.out
Index: profile_bug-SF.1314649.stable.out
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/bugs/Tests/profile_bug-SF.1314649.stable.out,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- profile_bug-SF.1314649.stable.out 29 Jun 2007 11:29:34 -0000 1.8
+++ profile_bug-SF.1314649.stable.out 1 Apr 2008 17:05:15 -0000 1.9
@@ -1,19 +1,22 @@
stdout of test 'profile_bug-SF.1314649` in directory 'src/test/bugs` itself:
-# 11:11:37 >
-# 11:11:37 > Mtimeout -timeout 180 Mserver
"--config=/ufs/niels/scratch/Linux-x86_64/etc/MonetDB.conf" --debug=10 --set
"monet_mod_path=/ufs/niels/scratch/Linux-x86_64/lib/MonetDB:/ufs/niels/scratch/Linux-x86_64/lib/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/Linux-x86_64/var/MonetDB/dbfarm" --set
"sql_logdir=/ufs/niels/scratch/Linux-x86_64/var/MonetDB/log" --set
mapi_port=38307 --set monet_prompt= --trace "--dbname=mTests_src_test_bugs"
--dbinit="module(sql_server); sql_server_start();" ; echo ; echo Over..
-# 11:11:37 >
-
-# Monet Database Server V4.13.1
-# Copyright (c) 1993-2006, 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.
+# 12:59:48 >
+# 12:59:48 > mserver5
"--config=/ufs/niels/scratch/monetdb/Linux-x86_64/etc/monetdb5.conf" --debug=10
--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=31247 --set
xrpc_port=46133 --set monet_prompt= --trace "--dbname=mTests_src_test_bugs"
--set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over..
+# 12:59:48 >
-printf("\nReady.\n");
+# MonetDB server v5.5.0, based on kernel v1.23.0
+# Serving database 'mTests_src_test_bugs'
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Copyright (c) 1993-2008 CWI, all rights reserved
+# Visit http://monetdb.cwi.nl/ for further information
+# Listening for connection requests on mapi:monetdb://koala.ins.cwi.nl:31247/
+# MonetDB/SQL module v2.23.0 loaded
Ready.
-quit();
+#function user.main():void;
+# clients.quit();
+#end main;
Over..
@@ -27,7 +30,7 @@
% tinyint # type
% 1 # length
[ 1 ]
-% tmp.profile, . # table_name
+% tmp.history, . # table_name
% query, single_value # name
% varchar, varchar # type
% 9, 7 # length
@@ -37,12 +40,11 @@
% int # type
% 1 # length
[ 1 ]
-% tmp.profile, . # table_name
+% tmp.history, . # table_name
% query, single_value # name
% varchar, varchar # type
% 51, 7 # length
[ "select 1;", "monetdb" ]
-[ "select query, user from profile;", "monetdb" ]
[ "select count(*) from t1314649 where \"human\" = true;", "monetdb"
]
# 12:58:09 >
U profile_bug-SF.1314649.sql
Index: profile_bug-SF.1314649.sql
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/bugs/Tests/profile_bug-SF.1314649.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- profile_bug-SF.1314649.sql 18 Jun 2006 00:00:00 -0000 1.2
+++ profile_bug-SF.1314649.sql 1 Apr 2008 17:05:14 -0000 1.3
@@ -3,8 +3,7 @@
create table t1314649 (name varchar(1024), human boolean);
insert into t1314649 values ('niels', true), ('fabian', false), ('martin',
NULL);
-set explain='profile';
-select 1;
-select query, user from profile;
-select count(*) from t1314649 where "human" = true;
-select query, user from profile;
+record select 1;
+select query, user from history;
+record select count(*) from t1314649 where "human" = true;
+select query, user from history;
U savepoint_rollback-bug-sf-953553.stable.err
Index: savepoint_rollback-bug-sf-953553.stable.err
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/bugs/Tests/savepoint_rollback-bug-sf-953553.stable.err,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- savepoint_rollback-bug-sf-953553.stable.err 18 Feb 2008 10:52:11 -0000
1.8
+++ savepoint_rollback-bug-sf-953553.stable.err 1 Apr 2008 17:05:17 -0000
1.9
@@ -10,10 +10,10 @@
# 14:39:28 > Mtimeout -timeout 60 MapiClient -lsql -u monetdb -P monetdb
--host=localhost --port=40084 < savepoint_rollback-bug-sf-953553.sql
# 14:39:28 >
-MAPI = [EMAIL PROTECTED]:39606
+MAPI = [EMAIL PROTECTED]:32916
QUERY = ROLLBACK TO SAVEPOINT a2;
-ERROR = !ROLLBACK TO SAVEPOINT: (a2) failed
- !ERROR: rollback savepoint a2 doesn't exists
+ERROR = !ERROR: rollback savepoint a2 doesn't exists
+ !ROLLBACK TO SAVEPOINT: (a2) failed
# 14:39:28 >
# 14:39:28 > Done.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
