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

Modified Files:
        crash_on_fkey_update2.SF-1703497.stable.err 
        explain.SF-1739353.stable.out.Five 
        jdbc_no_debug.SF-1739356-data.sql 
        jdbc_no_debug.SF-1739356.stable.err 
        variables.SF-1508160.stable.err 
        variables.SF-1508160.stable.out 
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 jdbc_no_debug.SF-1739356.stable.err
Index: jdbc_no_debug.SF-1739356.stable.err
===================================================================
RCS file: 
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.err,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- jdbc_no_debug.SF-1739356.stable.err 3 Oct 2007 14:06:09 -0000       1.2
+++ jdbc_no_debug.SF-1739356.stable.err 1 Apr 2008 17:05:09 -0000       1.3
@@ -17,6 +17,7 @@
 
 Error on line 1: We only support debugging SQL in interactive mode in: "debug"
 Error on line 2: We do not support tracing SQL in interactive mode in: "trace"
+Error on line 3: We do not support profiling SQL in interactive mode in: 
"profile"
 
 # 09:34:53 >  
 # 09:34:53 >  Done.

U jdbc_no_debug.SF-1739356-data.sql
Index: jdbc_no_debug.SF-1739356-data.sql
===================================================================
RCS file: 
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/jdbc_no_debug.SF-1739356-data.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- jdbc_no_debug.SF-1739356-data.sql   3 Oct 2007 14:06:05 -0000       1.2
+++ jdbc_no_debug.SF-1739356-data.sql   1 Apr 2008 17:05:08 -0000       1.3
@@ -1,5 +1,6 @@
 debug select count(*) from tables;
 trace select count(*) from tables;
+profile select count(*) from tables;
 
 -- next is allowed as it doesn't change the output of the statement
-profile select count(*) from tables;
+record select count(*) from tables;

U explain.SF-1739353.stable.out.Five
Index: explain.SF-1739353.stable.out.Five
===================================================================
RCS file: 
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/explain.SF-1739353.stable.out.Five,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- explain.SF-1739353.stable.out.Five  18 Feb 2008 10:52:10 -0000      1.14
+++ explain.SF-1739353.stable.out.Five  1 Apr 2008 17:05:07 -0000       1.15
@@ -89,10 +89,10 @@
 |     _15{rows=1:lng,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL PROTECTED]:oid} := 
nil;                         |
 |     _40{rows=56:lng,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL PROTECTED]:oid} := 
algebra.uselect(_36,nil:sht,2,false,false); |
 |     _36{rows=111:lng,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL PROTECTED]:oid} := 
nil;                       |
-|     _43{rows=56:lng,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL 
PROTECTED]:oid,tlb>[EMAIL PROTECTED]:oid,tub<[EMAIL PROTECTED]:oid} := 
algebra.markT(_40,[EMAIL PROTECTED]); |
+|     _43{rows=56:lng,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL 
PROTECTED]:oid,rows=1:lng,tub<[EMAIL PROTECTED]:oid} := 
algebra.markT(_40,[EMAIL PROTECTED]); |
 |     _40{rows=56:lng,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL PROTECTED]:oid} := 
nil;                        |
-|     _44{rows=56:lng,tlb>[EMAIL PROTECTED]:oid,tub<[EMAIL 
PROTECTED]:oid,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL PROTECTED]:oid} := 
bat.reverse(_43); |
-|     _43{rows=56:lng,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL 
PROTECTED]:oid,tlb>[EMAIL PROTECTED]:oid,tub<[EMAIL PROTECTED]:oid} := nil; |
+|     _44{rows=56:lng,tlb>[EMAIL PROTECTED]:oid,tub<[EMAIL 
PROTECTED]:oid,hub<[EMAIL PROTECTED]:oid} := bat.reverse(_43); |
+|     _43{rows=56:lng,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL 
PROTECTED]:oid,rows=1:lng,tub<[EMAIL PROTECTED]:oid} := nil; |
 |     _45{rows=1:lng,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL PROTECTED]:oid} := 
algebra.join(_12,_1);        |
 |     _1:bat[:oid,:int]{rows=1:lng}  := nil;                                   
|
 |     _46{rows=109:lng,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL PROTECTED]:oid} := 
algebra.join(_28,_23);     |
@@ -101,12 +101,12 @@
 |     _46{rows=109:lng,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL PROTECTED]:oid} := 
nil;                       |
 |     bat.append(_47,_45,true);                                                
|
 |     _45{rows=1:lng,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL PROTECTED]:oid} := 
nil;                         |
-|     _49{rows=56:lng,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL PROTECTED]:oid} := 
algebra.join(_44,_47);      |
+|     _49{rows=56:lng,hub<[EMAIL PROTECTED]:oid} := algebra.join(_44,_47);     
              |
 |     _47{rows=111:lng,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL PROTECTED]:oid} := 
nil;                       |
-|     _50{rows=56:lng,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL 
PROTECTED]:oid,tlb>[EMAIL PROTECTED]:oid,tub<[EMAIL PROTECTED]:oid} := 
algebra.markT(_49,[EMAIL PROTECTED]); |
-|     _49{rows=56:lng,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL PROTECTED]:oid} := 
nil;                        |
-|     _51{rows=56:lng,tlb>[EMAIL PROTECTED]:oid,tub<[EMAIL 
PROTECTED]:oid,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL PROTECTED]:oid} := 
bat.reverse(_50); |
-|     _50{rows=56:lng,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL 
PROTECTED]:oid,tlb>[EMAIL PROTECTED]:oid,tub<[EMAIL PROTECTED]:oid} := nil; |
+|     _50{rows=56:lng,hub<[EMAIL PROTECTED]:oid,tlb>[EMAIL 
PROTECTED]:oid,tub<[EMAIL PROTECTED]:oid} := algebra.markT(_49,[EMAIL 
PROTECTED]); |
+|     _49{rows=56:lng,hub<[EMAIL PROTECTED]:oid} := nil;                       
              |
+|     _51{rows=56:lng,tub<[EMAIL PROTECTED]:oid,hlb>[EMAIL 
PROTECTED]:oid,hub<[EMAIL PROTECTED]:oid} := bat.reverse(_50); |
+|     _50{rows=56:lng,hub<[EMAIL PROTECTED]:oid,tlb>[EMAIL 
PROTECTED]:oid,tub<[EMAIL PROTECTED]:oid} := nil;            |
 |     _52:bat[:oid,:str]{rows=1:lng}  := sql.bind("tmp","_tables","name",0);   
|
 |     _54{rows=1:lng,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL PROTECTED]:oid} := 
algebra.join(_12,_52);       |
 |     _12{rows=1:lng,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL PROTECTED]:oid} := 
nil;                         |
@@ -129,12 +129,12 @@
 |     _61{rows=109:lng,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL PROTECTED]:oid} := 
nil;                       |
 |     bat.append(_62,_54,true);                                                
|
 |     _54{rows=1:lng,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL PROTECTED]:oid} := 
nil;                         |
-|     _64{rows=56:lng,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL PROTECTED]:oid} := 
algebra.join(_44,_62);      |
-|     _44{rows=56:lng,tlb>[EMAIL PROTECTED]:oid,tub<[EMAIL 
PROTECTED]:oid,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL PROTECTED]:oid} := nil; |
+|     _64{rows=56:lng,hub<[EMAIL PROTECTED]:oid} := algebra.join(_44,_62);     
              |
+|     _44{rows=56:lng,tlb>[EMAIL PROTECTED]:oid,tub<[EMAIL 
PROTECTED]:oid,hub<[EMAIL PROTECTED]:oid} := nil;            |
 |     _62{rows=111:lng,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL PROTECTED]:oid} := 
nil;                       |
 |     _65{rows=56:lng,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL PROTECTED]:oid} := 
algebra.join(_51,_64);      |
-|     _51{rows=56:lng,tlb>[EMAIL PROTECTED]:oid,tub<[EMAIL 
PROTECTED]:oid,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL PROTECTED]:oid} := nil; |
-|     _64{rows=56:lng,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL PROTECTED]:oid} := 
nil;                        |
+|     _51{rows=56:lng,tub<[EMAIL PROTECTED]:oid,hlb>[EMAIL 
PROTECTED]:oid,hub<[EMAIL PROTECTED]:oid} := nil;            |
+|     _64{rows=56:lng,hub<[EMAIL PROTECTED]:oid} := nil;                       
              |
 |     _66 := sql.resultSet(1,1,_65);                                           
|
 |     sql.rsColumn(_66,"sys.tables","name","varchar",1024,0,_65);              
|
 |     _65{rows=56:lng,hlb>[EMAIL PROTECTED]:oid,hub<[EMAIL PROTECTED]:oid} := 
nil;                        |

U variables.SF-1508160.stable.out
Index: variables.SF-1508160.stable.out
===================================================================
RCS file: 
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/variables.SF-1508160.stable.out,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- variables.SF-1508160.stable.out     24 Oct 2006 16:02:55 -0000      1.3
+++ variables.SF-1508160.stable.out     1 Apr 2008 17:05:10 -0000       1.4
@@ -31,18 +31,8 @@
 % int # type
 % 1 # length
 [ 0    ]
-% . # table_name
-% single_value # name
-% varchar # type
-% 0 # length
-[ ""   ]
-% . # table_name
-% single_value # name
-% varchar # type
-% 0 # length
-[ ""   ]
 
-# 17:12:03 >  
-# 17:12:03 >  Done.
-# 17:12:03 >  
+# 10:42:20 >  
+# 10:42:20 >  Done.
+# 10:42:20 >  
 

U crash_on_fkey_update2.SF-1703497.stable.err
Index: crash_on_fkey_update2.SF-1703497.stable.err
===================================================================
RCS file: 
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/crash_on_fkey_update2.SF-1703497.stable.err,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- crash_on_fkey_update2.SF-1703497.stable.err 18 Feb 2008 10:52:09 -0000      
1.3
+++ crash_on_fkey_update2.SF-1703497.stable.err 1 Apr 2008 17:05:07 -0000       
1.4
@@ -10,19 +10,19 @@
 # 22:42:12 >  Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb 
--host=localhost --port=33006 
 # 22:42:12 >  
 
-MAPI  = [EMAIL PROTECTED]:39606
+MAPI  = [EMAIL PROTECTED]:30864
 QUERY = update t2 set id = 10 where id =3;
 ERROR = !ERROR: UPDATE: FOREIGN KEY constraint 't2.t2_id_fkey' violated
-MAPI  = [EMAIL PROTECTED]:39606
+MAPI  = [EMAIL PROTECTED]:30864
 QUERY = drop table t2;
 ERROR = !current transaction is aborted (please ROLLBACK)
-MAPI  = [EMAIL PROTECTED]:39606
+MAPI  = [EMAIL PROTECTED]:30864
 QUERY = drop table t1;
 ERROR = !current transaction is aborted (please ROLLBACK)
-MAPI  = [EMAIL PROTECTED]:39606
+MAPI  = [EMAIL PROTECTED]:30864
 QUERY = COMMIT;
-ERROR = !COMMIT: failed
-        !ERROR: COMMIT: transaction is aborted, will ROLLBACK instead
+ERROR = !ERROR: COMMIT: transaction is aborted, will ROLLBACK instead
+        !COMMIT: failed
 
 # 22:42:12 >  
 # 22:42:12 >  Done.

U variables.SF-1508160.stable.err
Index: variables.SF-1508160.stable.err
===================================================================
RCS file: 
/cvsroot/monetdb/sql/src/test/BugTracker/Tests/variables.SF-1508160.stable.err,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- variables.SF-1508160.stable.err     26 Jan 2008 13:39:15 -0000      1.3
+++ variables.SF-1508160.stable.err     1 Apr 2008 17:05:10 -0000       1.4
@@ -10,6 +10,12 @@
 # 17:12:03 >  Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb 
--host=localhost --port=38749  < variables.SF-1508160.sql
 # 17:12:03 >  
 
+MAPI  = [EMAIL PROTECTED]:32418
+QUERY = select explain;
+ERROR = !SELECT: identifier 'explain' unknown
+MAPI  = [EMAIL PROTECTED]:32418
+QUERY = select @explain;
+ERROR = !SELECT: '@explain' unknown
 
 # 17:12:03 >  
 # 17:12:03 >  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

Reply via email to