db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r292876 [2/2] - in /db/derby/code/trunk/java: engine/org/apache/derby/diag/ engine/org/apache/derby/iapi/sql/ engine/org/apache/derby/iapi/sql/compile/ engine/org/apache/derby/iapi/sql/dictionary/ engine/org/apache/derby/impl/sql/ engine/or...
Date Fri, 30 Sep 2005 23:48:22 GMT
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rlliso2multi.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rlliso2multi.out?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rlliso2multi.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rlliso2multi.out Fri Sep 30 16:38:14 2005
@@ -905,7 +905,7 @@
     state,
     status
 from 
-    new org.apache.derby.diag.LockTable() l  right outer join new org.apache.derby.diag.TransactionTable() t
+    syscs_diag.lock_table l  right outer join syscs_diag.transaction_table t
 on l.xid = t.xid where l.tableType <> 'S' and t.type='UserTransaction';
 0 rows inserted/updated/deleted
 ij(DDL)> --on l.xid = t.xid where l.tableType <> 'S' or l.tableType is null
@@ -924,7 +924,7 @@
     state,
     status
 from 
-    new org.apache.derby.diag.LockTable() l right outer join new org.apache.derby.diag.TransactionTable() t
+    syscs_diag.lock_table l right outer join syscs_diag.transaction_table t
 on l.xid = t.xid where l.tableType <> 'S' ;
 0 rows inserted/updated/deleted
 ij(DDL)> -- lock table with no join.
@@ -938,7 +938,7 @@
     cast(lockname as char(10)) as lockname,
     state
 from 
-    new org.apache.derby.diag.LockTable() l  
+    syscs_diag.lock_table l  
 where l.tableType <> 'S' ;
 0 rows inserted/updated/deleted
 ij(DDL)> -- transaction table with no join.
@@ -946,7 +946,7 @@
 select 
     *
 from 
-    new org.apache.derby.diag.TransactionTable() t ;
+    syscs_diag.transaction_table;
 0 rows inserted/updated/deleted
 ij(DDL)> commit;
 ij(DDL)> --------------------------------------------------------------------------------

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rlliso3multi.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rlliso3multi.out?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rlliso3multi.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rlliso3multi.out Fri Sep 30 16:38:14 2005
@@ -378,7 +378,7 @@
     state,
     status
 from 
-    new org.apache.derby.diag.LockTable() l  right outer join new org.apache.derby.diag.TransactionTable() t
+    syscs_diag.lock_table l  right outer join syscs_diag.transaction_table t
 on l.xid = t.xid where l.tableType <> 'S' and t.type='UserTransaction';
 0 rows inserted/updated/deleted
 ij(T6WRITER)> --on l.xid = t.xid where l.tableType <> 'S' or l.tableType is null
@@ -397,7 +397,7 @@
     state,
     status
 from 
-    new org.apache.derby.diag.LockTable() l right outer join new org.apache.derby.diag.TransactionTable() t
+    syscs_diag.lock_table l right outer join syscs_diag.transaction_table t
 on l.xid = t.xid where l.tableType <> 'S' ;
 0 rows inserted/updated/deleted
 ij(T6WRITER)> -- lock table with no join.
@@ -411,7 +411,7 @@
     cast(lockname as char(10)) as lockname,
     state
 from 
-    new org.apache.derby.diag.LockTable() l  
+    syscs_diag.lock_table l  
 where l.tableType <> 'S' ;
 0 rows inserted/updated/deleted
 ij(T6WRITER)> -- transaction table with no join.
@@ -419,7 +419,7 @@
 select 
     *
 from 
-    new org.apache.derby.diag.TransactionTable() t ;
+    syscs_diag.transaction_table;
 0 rows inserted/updated/deleted
 ij(T6WRITER)> -- set up
 set connection t6updater;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/stmtCache0.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/stmtCache0.out?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/stmtCache0.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/stmtCache0.out Fri Sep 30 16:38:14 2005
@@ -2,7 +2,7 @@
 -- testing a cache size of 0
 --
 -- see that it starts out empty; 
-select count(*) from new org.apache.derby.diag.StatementCache() as SC;
+select count(*) from syscs_diag.statement_cache;
 1          
 -----------
 0          
@@ -18,7 +18,7 @@
 -- this script registers the various consistency checks for
 -- statement caching as simple aliases for ease of scripting
 --
-create view SC_CONTENTS as select CAST (SUBSTR (CAST (SQL_TEXT as char(200)), 1, 30) AS CHAR(30)) AS SQL_TEXT from new org.apache.derby.diag.StatementCache() as SCVD;
+create view SC_CONTENTS as select CAST (SUBSTR (CAST (SQL_TEXT as char(200)), 1, 30) AS CHAR(30)) AS SQL_TEXT from syscs_diag.STATEMENT_CACHE;
 0 rows inserted/updated/deleted
 ij> commit;
 ij> -- see that it starts out empty; 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/stmtCache1.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/stmtCache1.out?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/stmtCache1.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/stmtCache1.out Fri Sep 30 16:38:14 2005
@@ -20,7 +20,7 @@
 -- this script registers the various consistency checks for
 -- statement caching as simple aliases for ease of scripting
 --
-create view SC_CONTENTS as select CAST (SUBSTR (CAST (SQL_TEXT as char(200)), 1, 30) AS CHAR(30)) AS SQL_TEXT from new org.apache.derby.diag.StatementCache() as SCVD;
+create view SC_CONTENTS as select CAST (SUBSTR (CAST (SQL_TEXT as char(200)), 1, 30) AS CHAR(30)) AS SQL_TEXT from syscs_diag.STATEMENT_CACHE;
 0 rows inserted/updated/deleted
 ij> commit;
 ij> -- see that it starts out almost empty; well, just us...

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerGeneral.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerGeneral.out?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerGeneral.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerGeneral.out Fri Sep 30 16:38:14 2005
@@ -1101,7 +1101,7 @@
 ij> autocommit off ;
 ij> delete from t1 where a = 3;
 1 row inserted/updated/deleted
-ij> select type, mode, tablename from new org.apache.derby.diag.LockTable() t order by tablename, type;
+ij> select type, mode, tablename from syscs_diag.lock_table order by tablename, type;
 TYPE |MODE|TABLENAME                                                                                                                       
 -------------------------------------------------------------------------------------------------------------------------------------------
 ROW  |X   |PARENT                                                                                                                          

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/update.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/update.out?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/update.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/update.out Fri Sep 30 16:38:14 2005
@@ -416,7 +416,7 @@
 ij> -- default read committed isolation level
 update tab1 set c2 = c2 + 3 where c1 = 1;
 1 row inserted/updated/deleted
-ij> select type, mode from new org.apache.derby.diag.LockTable() as lockstable where tablename = 'TAB1' order by type;
+ij> select type, mode from syscs_diag.lock_table where tablename = 'TAB1' order by type;
 TYPE |MODE
 ----------
 ROW  |X   
@@ -427,7 +427,7 @@
 0 rows inserted/updated/deleted
 ij> update tab1 set c2 = c2 + 3 where c1 = 1;
 1 row inserted/updated/deleted
-ij> select type, mode from new org.apache.derby.diag.LockTable() as lockstable where tablename = 'TAB1' order by type;
+ij> select type, mode from syscs_diag.lock_table where tablename = 'TAB1' order by type;
 TYPE |MODE
 ----------
 ROW  |X   

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/updatelocks.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/updatelocks.out?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/updatelocks.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/updatelocks.out Fri Sep 30 16:38:14 2005
@@ -20,7 +20,7 @@
     state,
     status
 from 
-    new org.apache.derby.diag.LockTable() l  right outer join new org.apache.derby.diag.TransactionTable() t
+    syscs_diag.lock_table l  right outer join syscs_diag.transaction_table t
 on l.xid = t.xid where l.tableType <> 'S' and t.type='UserTransaction';
 0 rows inserted/updated/deleted
 ij> --on l.xid = t.xid where l.tableType <> 'S' or l.tableType is null
@@ -39,7 +39,7 @@
     state,
     status
 from 
-    new org.apache.derby.diag.LockTable() l right outer join new org.apache.derby.diag.TransactionTable() t
+    syscs_diag.lock_table l right outer join syscs_diag.transaction_table t
 on l.xid = t.xid where l.tableType <> 'S' ;
 0 rows inserted/updated/deleted
 ij> -- lock table with no join.
@@ -53,7 +53,7 @@
     cast(lockname as char(10)) as lockname,
     state
 from 
-    new org.apache.derby.diag.LockTable() l  
+    syscs_diag.lock_table l  
 where l.tableType <> 'S' ;
 0 rows inserted/updated/deleted
 ij> -- transaction table with no join.
@@ -61,7 +61,7 @@
 select 
     *
 from 
-    new org.apache.derby.diag.TransactionTable() t ;
+    syscs_diag.transaction_table;
 0 rows inserted/updated/deleted
 ij> commit;
 ij> -- READ COMMITTED TEST

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/updatelocksJDBC30.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/updatelocksJDBC30.out?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/updatelocksJDBC30.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/updatelocksJDBC30.out Fri Sep 30 16:38:14 2005
@@ -18,7 +18,7 @@
     state,
     status
 from 
-    new org.apache.derby.diag.LockTable() l  right outer join new org.apache.derby.diag.TransactionTable() t
+    syscs_diag.lock_table l  right outer join syscs_diag.transaction_table t
 on l.xid = t.xid where l.tableType <> 'S' and t.type='UserTransaction';
 0 rows inserted/updated/deleted
 ij> --on l.xid = t.xid where l.tableType <> 'S' or l.tableType is null
@@ -37,7 +37,7 @@
     state,
     status
 from 
-    new org.apache.derby.diag.LockTable() l right outer join new org.apache.derby.diag.TransactionTable() t
+    syscs_diag.lock_table l right outer join syscs_diag.transaction_table t
 on l.xid = t.xid where l.tableType <> 'S' ;
 0 rows inserted/updated/deleted
 ij> -- lock table with no join.
@@ -51,7 +51,7 @@
     cast(lockname as char(10)) as lockname,
     state
 from 
-    new org.apache.derby.diag.LockTable() l  
+    syscs_diag.lock_table l  
 where l.tableType <> 'S' ;
 0 rows inserted/updated/deleted
 ij> -- transaction table with no join.
@@ -59,7 +59,7 @@
 select 
     *
 from 
-    new org.apache.derby.diag.TransactionTable() t ;
+    syscs_diag.transaction_table;
 0 rows inserted/updated/deleted
 ij> commit;
 ij> -- READ COMMITTED TEST

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaAnotherTest.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaAnotherTest.out?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaAnotherTest.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaAnotherTest.out Fri Sep 30 16:38:14 2005
@@ -24,7 +24,7 @@
     case when first_instant is NULL then 'NULL' else 'false' end as readOnly,
     cast (username as char(10)) as username,
     type 
-from new org.apache.derby.diag.TransactionTable() t;
+from syscs_diag.transaction_table;
 0 rows inserted/updated/deleted
 ij> select * from global_xactTable where gxid is not null order by gxid, username, status;
 GXID|STATUS  |READ&|USERNAME  |TYPE                          
@@ -108,7 +108,7 @@
 (3  |PREPARED|false|MAMTA     |UserTransaction               
 (4  |PREPARED|false|MAMTA     |UserTransaction               
 (5  |PREPARED|false|MAMTA     |UserTransaction               
-ij(LOCAL1)> select count(*) from new org.apache.derby.diag.LockTable() t where mode = 'X' or mode = 'IX';
+ij(LOCAL1)> select count(*) from syscs_diag.lock_table where mode = 'X' or mode = 'IX';
 1          
 -----------
 15         

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaMorph.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaMorph.out?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaMorph.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaMorph.out Fri Sep 30 16:38:14 2005
@@ -16,7 +16,7 @@
     case when first_instant is NULL then 'NULL' else 'false' end as readOnly,
     cast (username as char(10)) as username,
     type 
-from new org.apache.derby.diag.TransactionTable() t;
+from syscs_diag.transaction_table;
 0 rows inserted/updated/deleted
 ij> select * from global_xactTable where gxid is not null order by gxid,username;
 GXID|STATUS  |READ&|USERNAME  |TYPE                          
@@ -168,7 +168,7 @@
     status, 
     username, 
     type 
-from new org.apache.derby.diag.TransactionTable() t order by gxid, status, username, type;
+from syscs_diag.transaction_table order by gxid, status, username, type;
 GXID|STATUS  |USERNAME                                                                                                                        |TYPE                          
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 (3  |IDLE    |SKU                                                                                                                             |UserTransaction               

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaOffline1.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaOffline1.out?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaOffline1.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaOffline1.out Fri Sep 30 16:38:14 2005
@@ -24,7 +24,7 @@
     case when first_instant is NULL then 'NULL' else 'false' end as readOnly,
     cast (username as char(10)) as username,
     type 
-from new org.apache.derby.diag.TransactionTable() t;
+from syscs_diag.transaction_table;
 0 rows inserted/updated/deleted
 ij(XA)> run resource 'LockTableQuery.subsql';
 ij(XA)> create view lock_table as
@@ -39,7 +39,7 @@
     state,
     status
 from 
-    new org.apache.derby.diag.LockTable() l  right outer join new org.apache.derby.diag.TransactionTable() t
+    syscs_diag.lock_table l  right outer join syscs_diag.transaction_table t
 on l.xid = t.xid where l.tableType <> 'S' and t.type='UserTransaction';
 0 rows inserted/updated/deleted
 ij(XA)> --on l.xid = t.xid where l.tableType <> 'S' or l.tableType is null
@@ -58,7 +58,7 @@
     state,
     status
 from 
-    new org.apache.derby.diag.LockTable() l right outer join new org.apache.derby.diag.TransactionTable() t
+    syscs_diag.lock_table l right outer join syscs_diag.transaction_table t
 on l.xid = t.xid where l.tableType <> 'S' ;
 0 rows inserted/updated/deleted
 ij(XA)> -- lock table with no join.
@@ -72,7 +72,7 @@
     cast(lockname as char(10)) as lockname,
     state
 from 
-    new org.apache.derby.diag.LockTable() l  
+    syscs_diag.lock_table l  
 where l.tableType <> 'S' ;
 0 rows inserted/updated/deleted
 ij(XA)> -- transaction table with no join.
@@ -80,7 +80,7 @@
 select 
     *
 from 
-    new org.apache.derby.diag.TransactionTable() t ;
+    syscs_diag.transaction_table;
 0 rows inserted/updated/deleted
 ij(XA)> xa_end xa_success 0;
 ij(XA)> xa_commit xa_1phase 0;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaSimpleNegative.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaSimpleNegative.out?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaSimpleNegative.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaSimpleNegative.out Fri Sep 30 16:38:14 2005
@@ -32,7 +32,7 @@
     case when first_instant is NULL then 'NULL' else 'false' end as readOnly,
     cast (username as char(10)) as username,
     type 
-from new org.apache.derby.diag.TransactionTable() t;
+from syscs_diag.transaction_table;
 0 rows inserted/updated/deleted
 ij(XA)> insert into APP.negative values ('xyz', 1);
 1 row inserted/updated/deleted

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaSimplePositive.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaSimplePositive.out?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaSimplePositive.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaSimplePositive.out Fri Sep 30 16:38:14 2005
@@ -23,7 +23,7 @@
     case when first_instant is NULL then 'NULL' else 'false' end as readOnly,
     cast (username as char(10)) as username,
     type 
-from new org.apache.derby.diag.TransactionTable() t;
+from syscs_diag.transaction_table;
 0 rows inserted/updated/deleted
 ij(XA)> select * from global_xactTable where gxid is not null order by gxid;
 GXID|STATUS  |READ&|USERNAME  |TYPE                          

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaStateTran.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaStateTran.out?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaStateTran.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xaStateTran.out Fri Sep 30 16:38:14 2005
@@ -13,7 +13,7 @@
     case when first_instant is NULL then 'NULL' else 'false' end as readOnly,
     cast (username as char(10)) as username,
     type 
-from new org.apache.derby.diag.TransactionTable() t;
+from syscs_diag.transaction_table;
 0 rows inserted/updated/deleted
 ij> create table xastate(a int);
 0 rows inserted/updated/deleted

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xab2354.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xab2354.out?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xab2354.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/xab2354.out Fri Sep 30 16:38:14 2005
@@ -11,12 +11,12 @@
 ij(XA)> xa_start xa_noflags 1;
 ij(XA)> insert into foo values (2);
 1 row inserted/updated/deleted
-ij(XA)> select cast(global_xid as char(2)) as gxid, status from new org.apache.derby.diag.TransactionTable() t where gxid is not null order by gxid, status;
+ij(XA)> select cast(global_xid as char(2)) as gxid, status from syscs_diag.transaction_table where gxid is not null order by gxid, status;
 ERROR 42X04: Column 'GXID' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then 'GXID' is not a column in the target table.
 ij(XA)> xa_end xa_success 1;
 ij(XA)> xa_prepare 1;
 ij(XA)> xa_getconnection ;
-ij(XA)> select cast(global_xid as char(2)) as gxid, status from new org.apache.derby.diag.TransactionTable() t where gxid is not null order by gxid, status;
+ij(XA)> select cast(global_xid as char(2)) as gxid, status from syscs_diag.transaction_table where gxid is not null order by gxid, status;
 ERROR 42X04: Column 'GXID' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then 'GXID' is not a column in the target table.
 ij(XA)> xa_datasource 'wombat' shutdown;
 ERROR 08006: Database 'wombat' shutdown.
@@ -30,6 +30,6 @@
 xa_start xa_noflags 1;
 IJ ERROR: XAER_DUPID 
 ij(XA)> -- should see two transactions, one global transaction and one local
-select cast(global_xid as char(2)) as gxid, status from new org.apache.derby.diag.TransactionTable() t where gxid is not null order by gxid, status;
+select cast(global_xid as char(2)) as gxid, status from syscs_diag.transaction_table where gxid is not null order by gxid, status;
 ERROR 42X04: Column 'GXID' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then 'GXID' is not a column in the target table.
 ij(XA)> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaAnotherTest.sql
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaAnotherTest.sql?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaAnotherTest.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaAnotherTest.sql Fri Sep 30 16:38:14 2005
@@ -89,7 +89,7 @@
 -- at this point, should see 4 global connections in the prepared mode and one global
 -- connection in active mode and one local connection.
 select * from global_xactTable where gxid is not null order by gxid, username, status;
-select count(*) from new org.apache.derby.diag.LockTable() t where mode = 'X' or mode = 'IX';
+select count(*) from syscs_diag.lock_table where mode = 'X' or mode = 'IX';
 
 xa_datasource 'wombat' shutdown;
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaMorph.sql
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaMorph.sql?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaMorph.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaMorph.sql Fri Sep 30 16:38:14 2005
@@ -135,7 +135,7 @@
     status, 
     username, 
     type 
-from new org.apache.derby.diag.TransactionTable() t order by gxid, status, username, type;
+from syscs_diag.transaction_table order by gxid, status, username, type;
 
 select * from foo;
 delete from foo;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LockTableQuery.subsql
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LockTableQuery.subsql?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LockTableQuery.subsql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LockTableQuery.subsql Fri Sep 30 16:38:14 2005
@@ -9,7 +9,7 @@
     state,
     status
 from 
-    new org.apache.derby.diag.LockTable() l right outer join new org.apache.derby.diag.TransactionTable() t
+    syscs_diag.lock_table l right outer join syscs_diag.transaction_table t
 on l.xid = t.xid where l.tableType <> 'S' 
 order by 
     tabname, type desc, mode, cnt, lockname;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/autoincrement.sql
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/autoincrement.sql?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/autoincrement.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/autoincrement.sql Fri Sep 30 16:38:14 2005
@@ -401,24 +401,24 @@
 
 select * from t1;
 -- should see only locks on t1, no locks on system catalogs.
-select  l.type, l.tablename, l.mode from new org.apache.derby.diag.LockTable() l order by tablename, type;
+select  l.type, l.tablename, l.mode from syscs_diag.lock_table l order by tablename, type;
 
 delete from t1;
 commit;
 
 -- locks should be gone now.
-select  l.type, l.tablename, l.mode from new org.apache.derby.diag.LockTable() l order by tablename, type;
+select  l.type, l.tablename, l.mode from syscs_diag.lock_table l order by tablename, type;
 set isolation serializable;
 
 -- this will get a share  lock on syscolumns
 select columnname, autoincrementvalue
  from sys.syscolumns where columnname = 'YYY';
 
-select  l.type, l.tablename, l.mode from new org.apache.derby.diag.LockTable() l order by tablename, type;
+select  l.type, l.tablename, l.mode from syscs_diag.lock_table l order by tablename, type;
 
 insert into t1 (x) values (3);
 
-select  l.type, l.tablename, l.mode from new org.apache.derby.diag.LockTable() l order by tablename, type;
+select  l.type, l.tablename, l.mode from syscs_diag.lock_table l order by tablename, type;
 commit;
 
 -- try using default keyword with ai.

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/db2Compatibility.sql
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/db2Compatibility.sql?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/db2Compatibility.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/db2Compatibility.sql Fri Sep 30 16:38:14 2005
@@ -120,7 +120,7 @@
 select * from testCS, new org.apache.derbyTesting.functionTests.util.VTIClasses.PositiveInteger_VTICosting_SI(col1, 1) a;
 select * from new com.acme.myVTI() as T;
 select * from new org.apache.derbyTesting.not.myVTI() as T;
-select * from new org.apache.derby.diag.LockTable() as T;
+select * from syscs_diag.lock_table;
 
 -- VTI in CREATE TRIGGER statement
 -- beetle 5234

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dcl_readOnly.sql
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dcl_readOnly.sql?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dcl_readOnly.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/dcl_readOnly.sql Fri Sep 30 16:38:14 2005
@@ -21,4 +21,4 @@
 -- ensure that a read-only database automatically gets table locking
 autocommit off;
 select * from EMC.CONTACTS WITH RR;
-select TYPE, MODE, TABLENAME from new org.apache.derby.diag.LockTable() AS L ORDER BY 1,2,3;
\ No newline at end of file
+select TYPE, MODE, TABLENAME from syscs_diag.lock_table ORDER BY 1,2,3;
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ddlTableLockMode.sql
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ddlTableLockMode.sql?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ddlTableLockMode.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ddlTableLockMode.sql Fri Sep 30 16:38:14 2005
@@ -397,7 +397,7 @@
 -- should see only one lock; earlier used to 
 -- see 2, one IX and one for X.
 select count(*)
- from new org.apache.derby.diag.LockTable() l 
+ from syscs_diag.lock_table
  where tablename = 'DEFAULT1' and type = 'TABLE';
 
 commit;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/releaseCompileLocks.sql
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/releaseCompileLocks.sql?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/releaseCompileLocks.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/releaseCompileLocks.sql Fri Sep 30 16:38:14 2005
@@ -31,7 +31,7 @@
 (dmlstatic()) 
 from sys.systables where tablename = 'SYSCONGLOMERATES';
 
-select TYPE, MODE, TABLENAME, LOCKNAME, STATE from new org.apache.derby.diag.LockTable() l 
+select TYPE, MODE, TABLENAME, LOCKNAME, STATE from syscs_diag.lock_table
 order by 1;
 
 commit;
@@ -44,7 +44,7 @@
 from sys.systables where tablename = 'SYSCONGLOMERATES';
 
 -- only two locks!
-select TYPE, MODE, TABLENAME, LOCKNAME, STATE from new org.apache.derby.diag.LockTable() l 
+select TYPE, MODE, TABLENAME, LOCKNAME, STATE from syscs_diag.lock_table
 order by 1;
 
 -- verify that the row went into t1.
@@ -52,7 +52,7 @@
 drop table t1;
 commit;
 
-select TYPE, MODE, TABLENAME, LOCKNAME, STATE from new org.apache.derby.diag.LockTable() l 
+select TYPE, MODE, TABLENAME, LOCKNAME, STATE from syscs_diag.lock_table
 order by 1;
 
 commit;
@@ -65,18 +65,18 @@
 
 -- earlier we would get a bunch of locks on the system catalogs 
 -- when trying to resolve the method alias.
-select count(*) from new org.apache.derby.diag.LockTable() l;
+select count(*) from syscs_diag.lock_table;
 
 -- select from a system catalog.
 select count(*) from sys.sysviews;
 -- look ma, no locks.
-select count(*) from new org.apache.derby.diag.LockTable() l;
+select count(*) from syscs_diag.lock_table;
 
 insert into test_tab values (2);
 -- only see locks on test_tab, none on system catalogs
 -- 
 
-select TYPE, MODE, TABLENAME, LOCKNAME, STATE from new org.apache.derby.diag.LockTable() l
+select TYPE, MODE, TABLENAME, LOCKNAME, STATE from syscs_diag.lock_table
 order by 1;
 
 -- bugid 3214, atlas case: 962505
@@ -105,11 +105,11 @@
 
 -- prepare a statement-- no locks.
 prepare cursor1 as 'update test_tab set x=2 where x=?';
-select count(*) from new org.apache.derby.diag.LockTable() l;
+select count(*) from syscs_diag.lock_table;
 
 -- now execute it-- should see locks on test_tab
 execute cursor1 using 'values (1)';
-select TYPE, MODE, TABLENAME, LOCKNAME, STATE from new org.apache.derby.diag.LockTable() l 
+select TYPE, MODE, TABLENAME, LOCKNAME, STATE from syscs_diag.lock_table
 order by 1;
 commit;
 
@@ -125,7 +125,7 @@
 prepare ps as 'select * from t where c1 = ? and c2 = ?';
 
 -- no locks, no locks at all.
-select * from new org.apache.derby.diag.LockTable() l;
+select * from syscs_diag.lock_table;
 
 -- clear DataDictionary cache
 create table x(c1 int);
@@ -134,7 +134,7 @@
 
 -- try inserting into the table; no locks on system catalogs.
 prepare pi as 'insert into t values (3,2)';
-select * from new org.apache.derby.diag.LockTable() l;
+select * from syscs_diag.lock_table;
 
 commit;
 
@@ -145,7 +145,7 @@
 
 -- try updating the table; no locks on system catalogs.
 prepare p1 as 'update t set c2 = c1, c1 = c2';
-select * from new org.apache.derby.diag.LockTable() l;
+select * from syscs_diag.lock_table;
 
 commit;
 
@@ -156,7 +156,7 @@
 
 -- try deleting from the table; no locks on system catalogs.
 prepare p1 as 'delete from t';
-select * from new org.apache.derby.diag.LockTable() l;
+select * from syscs_diag.lock_table;
 
 commit;
 
@@ -169,5 +169,5 @@
 
 -- t has (1,1) (2,1) (3,2)
 prepare pu as 'update t set c2=2 where c1=2';
-select * from new org.apache.derby.diag.LockTable() l;
+select * from syscs_diag.lock_table;
 commit;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/stmtCache0.sql
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/stmtCache0.sql?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/stmtCache0.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/stmtCache0.sql Fri Sep 30 16:38:14 2005
@@ -4,7 +4,7 @@
 --
 
 -- see that it starts out empty; 
-select count(*) from new org.apache.derby.diag.StatementCache() as SC;
+select count(*) from syscs_diag.statement_cache;
 
 CREATE FUNCTION ConsistencyChecker() RETURNS VARCHAR(128)
 EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.T_ConsistencyChecker.runConsistencyChecker'

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/stmtCacheAliases.subsql
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/stmtCacheAliases.subsql?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/stmtCacheAliases.subsql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/stmtCacheAliases.subsql Fri Sep 30 16:38:14 2005
@@ -3,4 +3,4 @@
 -- statement caching as simple aliases for ease of scripting
 --
 
-create view SC_CONTENTS as select CAST (SUBSTR (CAST (SQL_TEXT as char(200)), 1, 30) AS CHAR(30)) AS SQL_TEXT from new org.apache.derby.diag.StatementCache() as SCVD;
+create view SC_CONTENTS as select CAST (SUBSTR (CAST (SQL_TEXT as char(200)), 1, 30) AS CHAR(30)) AS SQL_TEXT from syscs_diag.STATEMENT_CACHE;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/triggerGeneral.sql
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/triggerGeneral.sql?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/triggerGeneral.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/triggerGeneral.sql Fri Sep 30 16:38:14 2005
@@ -516,7 +516,7 @@
 
 autocommit off ;
 delete from t1 where a = 3;
-select type, mode, tablename from new org.apache.derby.diag.LockTable() t order by tablename, type;
+select type, mode, tablename from syscs_diag.lock_table order by tablename, type;
 rollback;
 autocommit on;
 drop table t1;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/update.sql
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/update.sql?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/update.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/update.sql Fri Sep 30 16:38:14 2005
@@ -240,13 +240,13 @@
 
 -- default read committed isolation level
 update tab1 set c2 = c2 + 3 where c1 = 1;
-select type, mode from new org.apache.derby.diag.LockTable() as lockstable where tablename = 'TAB1' order by type;
+select type, mode from syscs_diag.lock_table where tablename = 'TAB1' order by type;
 rollback;
 
 -- serializable isolation level
 set current isolation to SERIALIZABLE;
 update tab1 set c2 = c2 + 3 where c1 = 1;
-select type, mode from new org.apache.derby.diag.LockTable() as lockstable where tablename = 'TAB1' order by type;
+select type, mode from syscs_diag.lock_table where tablename = 'TAB1' order by type;
 rollback;
 
 autocommit on;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LockTableQuery.subsql
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LockTableQuery.subsql?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LockTableQuery.subsql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/LockTableQuery.subsql Fri Sep 30 16:38:14 2005
@@ -10,7 +10,7 @@
     state,
     status
 from 
-    new org.apache.derby.diag.LockTable() l  right outer join new org.apache.derby.diag.TransactionTable() t
+    syscs_diag.lock_table l  right outer join syscs_diag.transaction_table t
 on l.xid = t.xid where l.tableType <> 'S' and t.type='UserTransaction';
 --on l.xid = t.xid where l.tableType <> 'S' or l.tableType is null
 -- order by
@@ -29,7 +29,7 @@
     state,
     status
 from 
-    new org.apache.derby.diag.LockTable() l right outer join new org.apache.derby.diag.TransactionTable() t
+    syscs_diag.lock_table l right outer join syscs_diag.transaction_table t
 on l.xid = t.xid where l.tableType <> 'S' ;
 
 -- lock table with no join.
@@ -43,7 +43,7 @@
     cast(lockname as char(10)) as lockname,
     state
 from 
-    new org.apache.derby.diag.LockTable() l  
+    syscs_diag.lock_table l  
 where l.tableType <> 'S' ;
 
 -- transaction table with no join.
@@ -51,4 +51,4 @@
 select 
     *
 from 
-    new org.apache.derby.diag.TransactionTable() t ;
+    syscs_diag.transaction_table;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/TransactionTable.sql
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/TransactionTable.sql?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/TransactionTable.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/TransactionTable.sql Fri Sep 30 16:38:14 2005
@@ -6,7 +6,7 @@
 create view xactTable as
 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 syscs_diag.transaction_table
     where type != 'InternalTransaction';
 commit;
 select * from xactTable order by username, sql_text, status, type;
@@ -22,21 +22,21 @@
 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
+from syscs_diag.lock_table
 where tableType <> 'S' 
 order by lockname, mode, cnt, state;
 commit;
 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 ;
+from syscs_diag.lock_table ;
 
 
 insert into foo values (1), (3), (5), (7), (9);
 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
+from syscs_diag.lock_table
 where tableType <> 'S'
 order by lockname, mode, cnt, state;
 
@@ -44,7 +44,7 @@
 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;
+from syscs_diag.lock_table;
 
 
 insert into foo values (6), (10);
@@ -59,14 +59,14 @@
 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
+from syscs_diag.lock_table
 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
+from syscs_diag.lock_table
 where tableType <> 'S'
 order by lockname, mode, cnt, state;
 
@@ -79,7 +79,7 @@
 
 
 select type, lockcount as cnt, mode, tablename, lockname, state
-from new org.apache.derby.diag.LockTable() t
+from syscs_diag.lock_table
 where tableType <> 'S'
 order by lockname, mode, cnt, state;
 
@@ -87,7 +87,7 @@
 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
+from syscs_diag.lock_table
 where tableType <> 'S'
 order by lockname, mode, cnt, state;
 
@@ -99,7 +99,7 @@
 
 -- 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
+from syscs_diag.lock_table
 where tableType <> 'S'
 order by lockname, mode, cnt, state;
 
@@ -111,7 +111,7 @@
 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
+from syscs_diag.lock_table
 where tableType <> 'S'
 order by lockname, mode, cnt, state;
 
@@ -122,7 +122,7 @@
 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
+from syscs_diag.lock_table
 where tableType <> 'S'
 order by lockname, mode, cnt, state;
 
@@ -132,7 +132,7 @@
 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
+from   syscs_diag.lock_table l right outer join syscs_diag.transaction_table t
        on l.xid = t.xid where l.tableType <> 'S' and t.type='UserTransaction'
 order by lockname, mode, cnt, state;
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/global_xactTable.view
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/global_xactTable.view?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/global_xactTable.view (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/global_xactTable.view Fri Sep 30 16:38:14 2005
@@ -5,4 +5,4 @@
     case when first_instant is NULL then 'NULL' else 'false' end as readOnly,
     cast (username as char(10)) as username,
     type 
-from new org.apache.derby.diag.TransactionTable() t;
+from syscs_diag.transaction_table;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/lockTableVti.sql
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/lockTableVti.sql?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/lockTableVti.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/lockTableVti.sql Fri Sep 30 16:38:14 2005
@@ -18,13 +18,13 @@
 async C2S1 'update c1.account set b = b + 11';
 set connection C1;
 call c1.sleep(200);
-select state from new org.apache.derby.diag.LockTable() t order by state;
+select state from syscs_diag.lock_table order by state;
 commit;
 call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.locks.waitTimeout', '180');
 commit;
 set connection c2 ;
 wait for C2S1;
-select state from new org.apache.derby.diag.LockTable() t order by state;
+select state from syscs_diag.lock_table order by state;
 commit;
 
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/xab2354.sql
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/xab2354.sql?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/xab2354.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/xab2354.sql Fri Sep 30 16:38:14 2005
@@ -9,12 +9,12 @@
 
 xa_start xa_noflags 1;
 insert into foo values (2);
-select cast(global_xid as char(2)) as gxid, status from new org.apache.derby.diag.TransactionTable() t where gxid is not null order by gxid, status;
+select cast(global_xid as char(2)) as gxid, status from syscs_diag.transaction_table where gxid is not null order by gxid, status;
 xa_end xa_success 1;
 xa_prepare 1;
 
 xa_getconnection ;
-select cast(global_xid as char(2)) as gxid, status from new org.apache.derby.diag.TransactionTable() t where gxid is not null order by gxid, status;
+select cast(global_xid as char(2)) as gxid, status from syscs_diag.transaction_table where gxid is not null order by gxid, status;
 xa_datasource 'wombat' shutdown;
 
 xa_datasource 'wombat';
@@ -29,4 +29,4 @@
 xa_start xa_noflags 1;
 
 -- should see two transactions, one global transaction and one local
-select cast(global_xid as char(2)) as gxid, status from new org.apache.derby.diag.TransactionTable() t where gxid is not null order by gxid, status;
+select cast(global_xid as char(2)) as gxid, status from syscs_diag.transaction_table where gxid is not null order by gxid, status;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/derby94.sql
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/derby94.sql?rev=292876&r1=292875&r2=292876&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/derby94.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/derby94.sql Fri Sep 30 16:38:14 2005
@@ -1,7 +1,7 @@
 create view lock_table as select 
 cast(l.type as char(8)) as type,cast(lockcount as char(3)) as
 cnt,mode,cast(tablename as char(12)) as tabname,cast(lockname as char(10))
-as lockname,state from new org.apache.derby.diag.LockTable() l ;
+as lockname,state from syscs_diag.lock_table l ;
 autocommit off;
 create table derby94_t1(c1 int, c2 int not null primary key);
 create table derby94_t2(c1 int);



Mime
View raw message