db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r125123 - /incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/TransactionTable.out /incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/TransactionTable.sql
Date Fri, 14 Jan 2005 00:21:44 GMT
Author: djd
Date: Thu Jan 13 16:21:44 2005
New Revision: 125123

URL: http://svn.apache.org/viewcvs?view=rev&rev=125123
Log:
Actually fix TransactionTable test on linux.

Modified:
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/TransactionTable.out
   incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/TransactionTable.sql

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/TransactionTable.out
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/TransactionTable.out?view=diff&rev=125123&p1=incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/TransactionTable.out&r1=125122&p2=incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/TransactionTable.out&r2=125123
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/TransactionTable.out
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/TransactionTable.out
Thu Jan 13 16:21:44 2005
@@ -165,15 +165,14 @@
 ij(C2)> -- this should block and result in a timeout
 select * from foo;
 ERROR 40XL1: A lock could not be obtained within the time requested
-ij(C2)> -- when this finished rolling back, this transaction should be IDLE;
-select * from xactTable order by username, sql_text, status, type;
+ij(C2)> select * from xactTable order by username, sql_text, status, type;
 USERNAME                                                                                
                                       |TYPE                          |STATUS  |READONLY 
  |SQL_TEXT                                                                              
                                                                                         
                                                                                         
                                                                                         
                                                                                         
                                                                 
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-APP                                                                                     
                                       |UserTransaction               |IDLE    |readonly 
  |-- when this finished rolling back, this transaction should be IDLE;
-select * from xactTable order by username, sql_text, status, type                       
                                                                                         
                                                                                         
                                                                                         
                                                                                   
+APP                                                                                     
                                       |UserTransaction               |IDLE    |readonly 
  |select * from xactTable order by username, sql_text, status, type                     
                                                                                         
                                                                                         
                                                                                         
                                                                                         
                                                                 
 APP                                                                                     
                                       |UserTransaction               |ACTIVE  |not readonly|NULL
                                                                                         
                                                                                         
                                                                                         
                                                                                         
                                                                                         
                                                         
 APP                                                                                     
                                       |UserTransaction               |IDLE    |readonly 
  |NULL                                                                                  
                                                                                         
                                                                                         
                                                                                         
                                                                                         
                                                                 
-ij(C2)> select type, lockcount as cnt, mode, tablename, lockname, state
+ij(C2)> -- when last statement finished rolling back, this transaction should be IDLE;
+select type, lockcount as cnt, mode, tablename, lockname, state
 from new org.apache.derby.diag.LockTable() t
 where tableType <> 'S'
 order by lockname, mode, cnt, state;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/TransactionTable.sql
Url: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/TransactionTable.sql?view=diff&rev=125123&p1=incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/TransactionTable.sql&r1=125122&p2=incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/TransactionTable.sql&r2=125123
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/TransactionTable.sql
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/TransactionTable.sql
Thu Jan 13 16:21:44 2005
@@ -95,9 +95,9 @@
 
 select * from foo;
 
--- when this finished rolling back, this transaction should be IDLE;
 select * from xactTable order by username, sql_text, status, type;
 
+-- when last statement finished rolling back, this transaction should be IDLE;
 select type, lockcount as cnt, mode, tablename, lockname, state
 from new org.apache.derby.diag.LockTable() t
 where tableType <> 'S'

Mime
View raw message