You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by dj...@apache.org on 2005/01/14 01:05:25 UTC

svn commit: r125120 - /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

Author: djd
Date: Thu Jan 13 16:05:24 2005
New Revision: 125120

URL: http://svn.apache.org/viewcvs?view=rev&rev=125120
Log:
Fix TransactionTable test for linux build (hopefully).

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=125120&p1=incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/TransactionTable.out&r1=125119&p2=incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/TransactionTable.out&r2=125120
==============================================================================
--- 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:05:24 2005
@@ -4,9 +4,9 @@
 ij(C1)> set isolation to rr;
 0 rows inserted/updated/deleted
 ij(C1)> create view xactTable as
-select username, type, status, 
+select username, type, status,
 case when first_instant is NULL then 'readonly' else 'not readonly' end as readOnly, cast(sql_text as varchar(512)) sql_text
-	from new org.apache.derby.diag.TransactionTable() t
+  from new org.apache.derby.diag.TransactionTable() t
     where type != 'InternalTransaction';
 0 rows inserted/updated/deleted
 ij(C1)> commit;
@@ -33,10 +33,10 @@
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 APP                                                                                                                             |UserTransaction               |ACTIVE  |readonly    |select * from xactTable order by username, sql_text, status, type                                                                                                                                                                                                                                                                                                                                                                                                                                                               
 APP                                                                                                                             |UserTransaction               |IDLE    |readonly    |NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-ij(C1)> 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;
+ij(C1)> 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;
 TYPE |CNT  |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 TABLE|1    |S   |FOO                                                                                                                             |Tablelock           |GRANT
@@ -46,8 +46,8 @@
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 APP                                                                                                                             |UserTransaction               |IDLE    |readonly    |select * from xactTable order by username, sql_text, status, type                                                                                                                                                                                                                                                                                                                                                                                                                                                               
 APP                                                                                                                             |UserTransaction               |IDLE    |readonly    |NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-ij(C1)> select type, lockcount as cnt, mode, tablename, lockname, state 
-	from new org.apache.derby.diag.LockTable() t ;
+ij(C1)> select type, lockcount as cnt, mode, tablename, lockname, state
+from new org.apache.derby.diag.LockTable() t ;
 TYPE |CNT  |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ij(C1)> insert into foo values (1), (3), (5), (7), (9);
@@ -57,10 +57,10 @@
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 APP                                                                                                                             |UserTransaction               |ACTIVE  |not readonly|select * from xactTable order by username, sql_text, status, type                                                                                                                                                                                                                                                                                                                                                                                                                                                               
 APP                                                                                                                             |UserTransaction               |IDLE    |readonly    |NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-ij(C1)> 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;
+ij(C1)> 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;
 TYPE |CNT  |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ROW  |1    |X   |FOO                                                                                                                             |(1,10)              |GRANT
@@ -75,8 +75,8 @@
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 APP                                                                                                                             |UserTransaction               |IDLE    |readonly    |select * from xactTable order by username, sql_text, status, type                                                                                                                                                                                                                                                                                                                                                                                                                                                               
 APP                                                                                                                             |UserTransaction               |IDLE    |readonly    |NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-ij(C1)> select type, lockcount as cnt, mode, tablename, lockname, state 
-	from new org.apache.derby.diag.LockTable() t;
+ij(C1)> select type, lockcount as cnt, mode, tablename, lockname, state
+from new org.apache.derby.diag.LockTable() t;
 TYPE |CNT  |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ij(C1)> insert into foo values (6), (10);
@@ -86,33 +86,31 @@
 ij(C2)> set isolation to rr;
 0 rows inserted/updated/deleted
 ij(C2)> autocommit off;
-ij(C2)> 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    |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 
-	from new org.apache.derby.diag.LockTable() t 
-	where tableType <> 'S' 
-	order by lockname, mode, cnt, state;
+ij(C2)> 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;
 TYPE |CNT  |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ROW  |1    |X   |FOO                                                                                                                             |(1,12)              |GRANT
 ROW  |1    |X   |FOO                                                                                                                             |(1,13)              |GRANT
 TABLE|2    |IX  |FOO                                                                                                                             |Tablelock           |GRANT
-ij(C2)> -- make sure class alias works
-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               |ACTIVE  |readonly    |-- make sure class alias works
-select * from xactTable	order by username, sql_text, status, type                                                                                                                                                                                                                                                                                                                                                                                                                               
+APP                                                                                                                             |UserTransaction               |ACTIVE  |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 
-	from new org.apache.derby.diag.LockTable() t
-	where tableType <> 'S' 
-	order by lockname, mode, cnt, state;
+ij(C2)> 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;
 TYPE |CNT  |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ROW  |1    |X   |FOO                                                                                                                             |(1,12)              |GRANT
@@ -123,16 +121,16 @@
 A          
 -----------
 1          
-ij(C2)> 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               |ACTIVE  |readonly    |select * from xactTable	order by username, sql_text, status, type                                                                                                                                                                                                                                                                                                                                                                                                                                                               
+APP                                                                                                                             |UserTransaction               |ACTIVE  |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 
-	from new org.apache.derby.diag.LockTable() t
-	where tableType <> 'S' 
-	order by lockname, mode, cnt, state;
+ij(C2)> 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;
 TYPE |CNT  |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ROW  |1    |X   |FOO                                                                                                                             |(1,12)              |GRANT
@@ -143,16 +141,16 @@
 TABLE|2    |IX  |FOO                                                                                                                             |Tablelock           |GRANT
 ij(C2)> insert into foo values (2), (4);
 2 rows inserted/updated/deleted
-ij(C2)> 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               |ACTIVE  |not readonly|select * from xactTable	order by username, sql_text, status, type                                                                                                                                                                                                                                                                                                                                                                                                                                                               
+APP                                                                                                                             |UserTransaction               |ACTIVE  |not 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 
-	from new org.apache.derby.diag.LockTable() t
-	where tableType <> 'S' 
-	order by lockname, mode, cnt, state;
+ij(C2)> 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;
 TYPE |CNT  |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ROW  |1    |X   |FOO                                                                                                                             |(1,12)              |GRANT
@@ -167,18 +165,18 @@
 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)> -- when this finished rolling back, this transaction should be IDLE;
+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    |-- when this finished rolling back, this transaction should be IDLE;
+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 
-	from new org.apache.derby.diag.LockTable() t
-	where tableType <> 'S' 
-	order by lockname, mode, cnt, state;
+ij(C2)> 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;
 TYPE |CNT  |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ROW  |1    |X   |FOO                                                                                                                             |(1,12)              |GRANT
@@ -187,16 +185,16 @@
 ij(C2)> -- this should also block
 drop table foo;
 ERROR 40XL1: A lock could not be obtained within the time requested
-ij(C2)> 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    |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 
-	from new org.apache.derby.diag.LockTable() t
-	where tableType <> 'S' 
-	order by lockname, mode, cnt, state;
+ij(C2)> 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;
 TYPE |CNT  |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ROW  |1    |X   |FOO                                                                                                                             |(1,12)              |GRANT
@@ -205,15 +203,15 @@
 ij(C2)> commit;
 ij(C2)> disconnect;
 ij> set connection c1;
-ij(C1)> select * from xactTable	order by username, sql_text, status, type;
+ij(C1)> select * from xactTable order by username, sql_text, status, type;
 USERNAME                                                                                                                        |TYPE                          |STATUS  |READONLY    |SQL_TEXT                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-APP                                                                                                                             |UserTransaction               |ACTIVE  |not readonly|select * from xactTable	order by username, sql_text, status, type                                                                                                                                                                                                                                                                                                                                                                                                                                                               
+APP                                                                                                                             |UserTransaction               |ACTIVE  |not readonly|select * from xactTable order by username, sql_text, status, type                                                                                                                                                                                                                                                                                                                                                                                                                                                               
 APP                                                                                                                             |UserTransaction               |IDLE    |readonly    |NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-ij(C1)> 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;
+ij(C1)> 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;
 TYPE |CNT  |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ROW  |1    |X   |FOO                                                                                                                             |(1,12)              |GRANT
@@ -222,15 +220,15 @@
 ij(C1)> drop table foo;
 0 rows inserted/updated/deleted
 ij(C1)> commit;
-ij(C1)> select * from xactTable	order by username, sql_text, status, type;
+ij(C1)> select * from xactTable order by username, sql_text, status, type;
 USERNAME                                                                                                                        |TYPE                          |STATUS  |READONLY    |SQL_TEXT                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-APP                                                                                                                             |UserTransaction               |IDLE    |readonly    |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               |IDLE    |readonly    |NULL                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
-ij(C1)> select l.type, lockcount as cnt, mode, tablename, lockname, state 
-	from   new org.apache.derby.diag.LockTable() l right outer join new org.apache.derby.diag.TransactionTable() t
+ij(C1)> select l.type, lockcount as cnt, mode, tablename, lockname, state
+from   new org.apache.derby.diag.LockTable() l right outer join new org.apache.derby.diag.TransactionTable() t
        on l.xid = t.xid where l.tableType <> 'S' and t.type='UserTransaction'
-	order by lockname, mode, cnt, state;
+order by lockname, mode, cnt, state;
 TYPE |CNT  |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ij(C1)> commit;

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=125120&p1=incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/TransactionTable.sql&r1=125119&p2=incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/TransactionTable.sql&r2=125120
==============================================================================
--- 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:05:24 2005
@@ -4,47 +4,47 @@
 connect 'wombat' as c1;
 set isolation to rr;
 create view xactTable as
-select username, type, status, 
+select username, type, status,
 case when first_instant is NULL then 'readonly' else 'not readonly' end as readOnly, cast(sql_text as varchar(512)) sql_text
-	from new org.apache.derby.diag.TransactionTable() t
+  from new org.apache.derby.diag.TransactionTable() t
     where type != 'InternalTransaction';
 commit;
-select * from xactTable order by username, sql_text, status, type; 
+select * from xactTable order by username, sql_text, status, type;
 
 create table foo (a int);
 create index fooi on foo (a);
 
-select * from xactTable order by username, sql_text, status, type; 
+select * from xactTable order by username, sql_text, status, type;
 
 autocommit off;
 select * from foo;
 
-select * from xactTable order by username, sql_text, status, type; 
+select * from xactTable order by username, sql_text, status, type;
 
-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;
+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;
 commit;
-select * from xactTable order by username, sql_text, status, type; 
+select * from xactTable order by username, sql_text, status, type;
 
-select type, lockcount as cnt, mode, tablename, lockname, state 
-	from new org.apache.derby.diag.LockTable() t ;
+select type, lockcount as cnt, mode, tablename, lockname, state
+from new org.apache.derby.diag.LockTable() t ;
 
 
 insert into foo values (1), (3), (5), (7), (9);
-select * from xactTable order by username, sql_text, status, type; 
+select * from xactTable order by username, sql_text, status, type;
 
-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;
+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;
 
 commit;
-select * from xactTable order by username, sql_text, status, type; 
+select * from xactTable order by username, sql_text, status, type;
 
-select type, lockcount as cnt, mode, tablename, lockname, state 
-	from new org.apache.derby.diag.LockTable() t; 
+select type, lockcount as cnt, mode, tablename, lockname, state
+from new org.apache.derby.diag.LockTable() t;
 
 
 insert into foo values (6), (10);
@@ -56,86 +56,85 @@
 
 autocommit off;
 
-select * from xactTable	order by username, sql_text, status, type; 
+select * from xactTable order by username, sql_text, status, type;
 
-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;
-
--- make sure class alias works
-select * from xactTable	order by username, sql_text, status, type; 
-
-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;
+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;
+
+select * from xactTable order by username, sql_text, status, type;
+
+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;
 
 
 autocommit off;
 
 select * from foo where a < 2;
 
-select * from xactTable	order by username, sql_text, status, type; 
+select * from xactTable order by username, sql_text, status, type;
 
 
-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;
+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;
 
 insert into foo values (2), (4);
-select * from xactTable	order by username, sql_text, status, type; 
+select * from xactTable order by username, sql_text, status, type;
 
-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;
+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;
 
 -- this should block and result in a timeout
 
 select * from foo;
 
--- when this finished rolling back, this transaction should be IDLE
-select * from xactTable	order by username, sql_text, status, type; 
+-- when this finished rolling back, this transaction should be IDLE;
+select * from xactTable order by username, sql_text, status, type;
 
-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;
+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;
 
 
 -- this should also block
 
 drop table foo;
 
-select * from xactTable	order by username, sql_text, status, type; 
+select * from xactTable order by username, sql_text, status, type;
 
-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;
+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;
 
 commit;
 disconnect;
 
 set connection c1;
-select * from xactTable	order by username, sql_text, status, type; 
+select * from xactTable order by username, sql_text, status, type;
 
-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;
+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;
 
 drop table foo;
 
 commit;
-select * from xactTable	order by username, sql_text, status, type; 
+select * from xactTable order by username, sql_text, status, type;
 
-select l.type, lockcount as cnt, mode, tablename, lockname, state 
-	from   new org.apache.derby.diag.LockTable() l right outer join new org.apache.derby.diag.TransactionTable() t
+select l.type, lockcount as cnt, mode, tablename, lockname, state
+from   new org.apache.derby.diag.LockTable() l right outer join new org.apache.derby.diag.TransactionTable() t
        on l.xid = t.xid where l.tableType <> 'S' and t.type='UserTransaction'
-	order by lockname, mode, cnt, state;
+order by lockname, mode, cnt, state;
 
 commit;
 disconnect;