db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r1443812 [2/6] - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/ suites/ tests/store/
Date Fri, 08 Feb 2013 00:51:10 GMT
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/SpaceTable.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/SpaceTable.out?rev=1443812&r1=1443811&r2=1443812&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/SpaceTable.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/SpaceTable.out Fri Feb  8 00:51:09 2013
@@ -1,4 +1,4 @@
-ij> --
+ij(CONNECTION1)> --
 --   Licensed to the Apache Software Foundation (ASF) under one or more
 --   contributor license agreements.  See the NOTICE file distributed with
 --   this work for additional information regarding copyright ownership.
@@ -19,8 +19,8 @@ ij> --
 -- not consistent across runs, in particular for indexes, but also for
 -- tables. 
 -- Therefore tests do not report the numunfilledpages column
-run resource 'createTestProcedures.subsql';
-ij> --
+run resource '/org/apache/derbyTesting/functionTests/tests/store/createTestProcedures.subsql';
+ij(CONNECTION1)> --
 --   Licensed to the Apache Software Foundation (ASF) under one or more
 --   contributor license agreements.  See the NOTICE file distributed with
 --   this work for additional information regarding copyright ownership.
@@ -38,53 +38,53 @@ ij> --
 --
 CREATE FUNCTION  PADSTRING (DATA VARCHAR(32000), LENGTH INTEGER) RETURNS VARCHAR(32000) EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.Formatters.padString' LANGUAGE JAVA PARAMETER STYLE JAVA;
 0 rows inserted/updated/deleted
-ij> CREATE PROCEDURE WAIT_FOR_POST_COMMIT() DYNAMIC RESULT SETS 0 LANGUAGE JAVA EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.T_Access.waitForPostCommitToFinish' PARAMETER STYLE JAVA;
+ij(CONNECTION1)> CREATE PROCEDURE WAIT_FOR_POST_COMMIT() DYNAMIC RESULT SETS 0 LANGUAGE JAVA EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.T_Access.waitForPostCommitToFinish' PARAMETER STYLE JAVA;
 0 rows inserted/updated/deleted
-ij> call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.storage.pageSize', '4096');
+ij(CONNECTION1)> call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.storage.pageSize', '4096');
 0 rows inserted/updated/deleted
-ij> create table ideleteu (a varchar(2000), b varchar(2000)) ;
+ij(CONNECTION1)> create table ideleteu (a varchar(2000), b varchar(2000)) ;
 0 rows inserted/updated/deleted
-ij> insert into ideleteu values (PADSTRING('rrrrrrrrrr',2000), PADSTRING('ssssssssssssssss',2000));
+ij(CONNECTION1)> insert into ideleteu values (PADSTRING('rrrrrrrrrr',2000), PADSTRING('ssssssssssssssss',2000));
 1 row inserted/updated/deleted
-ij> insert into ideleteu values (PADSTRING('rrrrrrrrrr',2000), PADSTRING('ssssssssssssssss',2000));
+ij(CONNECTION1)> insert into ideleteu values (PADSTRING('rrrrrrrrrr',2000), PADSTRING('ssssssssssssssss',2000));
 1 row inserted/updated/deleted
-ij> insert into ideleteu values (PADSTRING('rrrrrrrrrr',2000), PADSTRING('ssssssssssssssss',2000));
+ij(CONNECTION1)> insert into ideleteu values (PADSTRING('rrrrrrrrrr',2000), PADSTRING('ssssssssssssssss',2000));
 1 row inserted/updated/deleted
-ij> insert into ideleteu values (PADSTRING('rrrrrrrrrr',2000), PADSTRING('ssssssssssssssss',2000));
+ij(CONNECTION1)> insert into ideleteu values (PADSTRING('rrrrrrrrrr',2000), PADSTRING('ssssssssssssssss',2000));
 1 row inserted/updated/deleted
-ij> insert into ideleteu values (PADSTRING('rrrrrrrrrr',2000), PADSTRING('ssssssssssssssss',2000));
+ij(CONNECTION1)> insert into ideleteu values (PADSTRING('rrrrrrrrrr',2000), PADSTRING('ssssssssssssssss',2000));
 1 row inserted/updated/deleted
-ij> -- This query also tests the SpaceTable class alias
+ij(CONNECTION1)> -- This query also tests the SpaceTable class alias
 select conglomeratename, isindex, numallocatedpages, numfreepages, pagesize, estimspacesaving
 	from new org.apache.derby.diag.SpaceTable('IDELETEU') t
 	order by conglomeratename;
 CONGLOMERATENAME                                                                                                                |ISIND&|NUMALLOCATEDPAGES   |NUMFREEPAGES        |PAGESIZE   |ESTIMSPACESAVING    
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 IDELETEU                                                                                                                        |0     |6                   |0                   |4096       |0                   
-ij> delete from ideleteu;
+ij(CONNECTION1)> delete from ideleteu;
 5 rows inserted/updated/deleted
-ij> CALL WAIT_FOR_POST_COMMIT();
+ij(CONNECTION1)> CALL WAIT_FOR_POST_COMMIT();
 0 rows inserted/updated/deleted
-ij> select conglomeratename, isindex, numallocatedpages, numfreepages, pagesize, estimspacesaving
+ij(CONNECTION1)> select conglomeratename, isindex, numallocatedpages, numfreepages, pagesize, estimspacesaving
 	from new org.apache.derby.diag.SpaceTable('IDELETEU') t
 	order by conglomeratename;
 CONGLOMERATENAME                                                                                                                |ISIND&|NUMALLOCATEDPAGES   |NUMFREEPAGES        |PAGESIZE   |ESTIMSPACESAVING    
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 IDELETEU                                                                                                                        |0     |1                   |5                   |4096       |20480               
-ij> select conglomeratename, isindex, numallocatedpages, numfreepages, pagesize, estimspacesaving
+ij(CONNECTION1)> select conglomeratename, isindex, numallocatedpages, numfreepages, pagesize, estimspacesaving
 	from new org.apache.derby.diag.SpaceTable('PLATYPUS') t
 	order by conglomeratename;
 CONGLOMERATENAME                                                                                                                |ISIND&|NUMALLOCATEDPAGES   |NUMFREEPAGES        |PAGESIZE   |ESTIMSPACESAVING    
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ij> create table platypus (a varchar(1000), b varchar(3500), c varchar(400), d varchar(100)) ;
+ij(CONNECTION1)> create table platypus (a varchar(1000), b varchar(3500), c varchar(400), d varchar(100)) ;
 0 rows inserted/updated/deleted
-ij> create index kookaburra on platypus (a) ;
+ij(CONNECTION1)> create index kookaburra on platypus (a) ;
 0 rows inserted/updated/deleted
-ij> create index echidna on platypus (c) ;
+ij(CONNECTION1)> create index echidna on platypus (c) ;
 0 rows inserted/updated/deleted
-ij> create index wallaby on platypus (a,c,d) ;
+ij(CONNECTION1)> create index wallaby on platypus (a,c,d) ;
 0 rows inserted/updated/deleted
-ij> select conglomeratename, isindex, numallocatedpages, numfreepages, pagesize, estimspacesaving
+ij(CONNECTION1)> select conglomeratename, isindex, numallocatedpages, numfreepages, pagesize, estimspacesaving
 	from new org.apache.derby.diag.SpaceTable('PLATYPUS') t
 	order by conglomeratename;
 CONGLOMERATENAME                                                                                                                |ISIND&|NUMALLOCATEDPAGES   |NUMFREEPAGES        |PAGESIZE   |ESTIMSPACESAVING    
@@ -93,19 +93,19 @@ ECHIDNA                                 
 KOOKABURRA                                                                                                                      |1     |1                   |0                   |4096       |0                   
 PLATYPUS                                                                                                                        |0     |1                   |0                   |4096       |0                   
 WALLABY                                                                                                                         |1     |1                   |0                   |4096       |0                   
-ij> insert into platypus values (PADSTRING('wwwwwww',1000), PADSTRING('xxx',3500), PADSTRING('yy',400), PADSTRING('zzz',100));
+ij(CONNECTION1)> insert into platypus values (PADSTRING('wwwwwww',1000), PADSTRING('xxx',3500), PADSTRING('yy',400), PADSTRING('zzz',100));
 1 row inserted/updated/deleted
-ij> insert into platypus values (PADSTRING('wwwwwww',1000), PADSTRING('xxx',3500), PADSTRING('yy',400), PADSTRING('zzz',100));
+ij(CONNECTION1)> insert into platypus values (PADSTRING('wwwwwww',1000), PADSTRING('xxx',3500), PADSTRING('yy',400), PADSTRING('zzz',100));
 1 row inserted/updated/deleted
-ij> insert into platypus values (PADSTRING('wwwwwww',1000), PADSTRING('xxx',3500), PADSTRING('yy',400), PADSTRING('zzz',100));
+ij(CONNECTION1)> insert into platypus values (PADSTRING('wwwwwww',1000), PADSTRING('xxx',3500), PADSTRING('yy',400), PADSTRING('zzz',100));
 1 row inserted/updated/deleted
-ij> insert into platypus values (PADSTRING('wwwwwww',1000), PADSTRING('xxx',3500), PADSTRING('yy',400), PADSTRING('zzz',100));
+ij(CONNECTION1)> insert into platypus values (PADSTRING('wwwwwww',1000), PADSTRING('xxx',3500), PADSTRING('yy',400), PADSTRING('zzz',100));
 1 row inserted/updated/deleted
-ij> insert into platypus values (PADSTRING('wwwwwww',1000), PADSTRING('xxx',3500), PADSTRING('yy',400), PADSTRING('zzz',100));
+ij(CONNECTION1)> insert into platypus values (PADSTRING('wwwwwww',1000), PADSTRING('xxx',3500), PADSTRING('yy',400), PADSTRING('zzz',100));
 1 row inserted/updated/deleted
-ij> insert into platypus values (PADSTRING('wwwwwww',1000), PADSTRING('xxx',3500), PADSTRING('yy',400), PADSTRING('zzz',100));
+ij(CONNECTION1)> insert into platypus values (PADSTRING('wwwwwww',1000), PADSTRING('xxx',3500), PADSTRING('yy',400), PADSTRING('zzz',100));
 1 row inserted/updated/deleted
-ij> select conglomeratename, isindex, numallocatedpages, numfreepages, pagesize, estimspacesaving
+ij(CONNECTION1)> select conglomeratename, isindex, numallocatedpages, numfreepages, pagesize, estimspacesaving
 	from new org.apache.derby.diag.SpaceTable('PLATYPUS') t
 	order by conglomeratename;
 CONGLOMERATENAME                                                                                                                |ISIND&|NUMALLOCATEDPAGES   |NUMFREEPAGES        |PAGESIZE   |ESTIMSPACESAVING    
@@ -114,15 +114,15 @@ ECHIDNA                                 
 KOOKABURRA                                                                                                                      |1     |4                   |0                   |4096       |0                   
 PLATYPUS                                                                                                                        |0     |13                  |0                   |4096       |0                   
 WALLABY                                                                                                                         |1     |8                   |0                   |4096       |0                   
-ij> insert into platypus values (PADSTRING('wwwwwww',1000), PADSTRING('xxx',3500), PADSTRING('yy',400), PADSTRING('zzz',100));
+ij(CONNECTION1)> insert into platypus values (PADSTRING('wwwwwww',1000), PADSTRING('xxx',3500), PADSTRING('yy',400), PADSTRING('zzz',100));
 1 row inserted/updated/deleted
-ij> insert into platypus values (PADSTRING('wwwwwww',1000), PADSTRING('xxx',3500), PADSTRING('yy',400), PADSTRING('zzz',100));
+ij(CONNECTION1)> insert into platypus values (PADSTRING('wwwwwww',1000), PADSTRING('xxx',3500), PADSTRING('yy',400), PADSTRING('zzz',100));
 1 row inserted/updated/deleted
-ij> insert into platypus values (PADSTRING('wwwwwww',1000), PADSTRING('xxx',3500), PADSTRING('yy',400), PADSTRING('zzz',100));
+ij(CONNECTION1)> insert into platypus values (PADSTRING('wwwwwww',1000), PADSTRING('xxx',3500), PADSTRING('yy',400), PADSTRING('zzz',100));
 1 row inserted/updated/deleted
-ij> insert into platypus values (PADSTRING('wwwwwww',1000), PADSTRING('xxx',3500), PADSTRING('yy',400), PADSTRING('zzz',100));
+ij(CONNECTION1)> insert into platypus values (PADSTRING('wwwwwww',1000), PADSTRING('xxx',3500), PADSTRING('yy',400), PADSTRING('zzz',100));
 1 row inserted/updated/deleted
-ij> select conglomeratename, isindex, numallocatedpages, numfreepages, pagesize, estimspacesaving
+ij(CONNECTION1)> select conglomeratename, isindex, numallocatedpages, numfreepages, pagesize, estimspacesaving
 	from new org.apache.derby.diag.SpaceTable('PLATYPUS') t
 	order by conglomeratename;
 CONGLOMERATENAME                                                                                                                |ISIND&|NUMALLOCATEDPAGES   |NUMFREEPAGES        |PAGESIZE   |ESTIMSPACESAVING    
@@ -131,11 +131,11 @@ ECHIDNA                                 
 KOOKABURRA                                                                                                                      |1     |8                   |0                   |4096       |0                   
 PLATYPUS                                                                                                                        |0     |21                  |0                   |4096       |0                   
 WALLABY                                                                                                                         |1     |16                  |0                   |4096       |0                   
-ij> delete from platypus;
+ij(CONNECTION1)> delete from platypus;
 10 rows inserted/updated/deleted
-ij> CALL WAIT_FOR_POST_COMMIT();
+ij(CONNECTION1)> CALL WAIT_FOR_POST_COMMIT();
 0 rows inserted/updated/deleted
-ij> select conglomeratename, isindex, numallocatedpages, numfreepages, pagesize, estimspacesaving
+ij(CONNECTION1)> select conglomeratename, isindex, numallocatedpages, numfreepages, pagesize, estimspacesaving
 	from new org.apache.derby.diag.SpaceTable('PLATYPUS') t
 	order by conglomeratename;
 CONGLOMERATENAME                                                                                                                |ISIND&|NUMALLOCATEDPAGES   |NUMFREEPAGES        |PAGESIZE   |ESTIMSPACESAVING    
@@ -144,32 +144,32 @@ ECHIDNA                                 
 KOOKABURRA                                                                                                                      |1     |1                   |7                   |4096       |28672               
 PLATYPUS                                                                                                                        |0     |1                   |20                  |4096       |81920               
 WALLABY                                                                                                                         |1     |15                  |1                   |4096       |4096                
-ij> select conglomeratename, isindex, numallocatedpages, numfreepages, numunfilledpages, pagesize, estimspacesaving
+ij(CONNECTION1)> select conglomeratename, isindex, numallocatedpages, numfreepages, numunfilledpages, pagesize, estimspacesaving
 	from new org.apache.derby.diag.SpaceTable('NONEXISTING') t
 	order by conglomeratename;
 CONGLOMERATENAME                                                                                                                |ISIND&|NUMALLOCATEDPAGES   |NUMFREEPAGES        |NUMUNFILLEDPAGES    |PAGESIZE   |ESTIMSPACESAVING    
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ij> create table "platypus2" (a varchar(10), b varchar(1500), c varchar(400), d varchar(100)) ;
+ij(CONNECTION1)> create table "platypus2" (a varchar(10), b varchar(1500), c varchar(400), d varchar(100)) ;
 0 rows inserted/updated/deleted
-ij> insert into "platypus2" (values (PADSTRING('wwwwwww',10), PADSTRING('xxx',1500), PADSTRING('yy',400), PADSTRING('zzz',100)));
+ij(CONNECTION1)> insert into "platypus2" (values (PADSTRING('wwwwwww',10), PADSTRING('xxx',1500), PADSTRING('yy',400), PADSTRING('zzz',100)));
 1 row inserted/updated/deleted
-ij> insert into "platypus2" (values (PADSTRING('wwwwwww',10), PADSTRING('xxx',1500), PADSTRING('yy',400), PADSTRING('zzz',100)));
+ij(CONNECTION1)> insert into "platypus2" (values (PADSTRING('wwwwwww',10), PADSTRING('xxx',1500), PADSTRING('yy',400), PADSTRING('zzz',100)));
 1 row inserted/updated/deleted
-ij> insert into "platypus2" (values (PADSTRING('wwwwwww',10), PADSTRING('xxx',1500), PADSTRING('yy',400), PADSTRING('zzz',100)));
+ij(CONNECTION1)> insert into "platypus2" (values (PADSTRING('wwwwwww',10), PADSTRING('xxx',1500), PADSTRING('yy',400), PADSTRING('zzz',100)));
 1 row inserted/updated/deleted
-ij> insert into "platypus2" (values (PADSTRING('wwwwwww',10), PADSTRING('xxx',1500), PADSTRING('yy',400), PADSTRING('zzz',100)));
+ij(CONNECTION1)> insert into "platypus2" (values (PADSTRING('wwwwwww',10), PADSTRING('xxx',1500), PADSTRING('yy',400), PADSTRING('zzz',100)));
 1 row inserted/updated/deleted
-ij> insert into "platypus2" (values (PADSTRING('wwwwwww',10), PADSTRING('xxx',1500), PADSTRING('yy',400), PADSTRING('zzz',100)));
+ij(CONNECTION1)> insert into "platypus2" (values (PADSTRING('wwwwwww',10), PADSTRING('xxx',1500), PADSTRING('yy',400), PADSTRING('zzz',100)));
 1 row inserted/updated/deleted
-ij> insert into "platypus2" (values (PADSTRING('wwwwwww',10), PADSTRING('xxx',1500), PADSTRING('yy',400), PADSTRING('zzz',100)));
+ij(CONNECTION1)> insert into "platypus2" (values (PADSTRING('wwwwwww',10), PADSTRING('xxx',1500), PADSTRING('yy',400), PADSTRING('zzz',100)));
 1 row inserted/updated/deleted
-ij> create index kookaburra2 on "platypus2" (a);
+ij(CONNECTION1)> create index kookaburra2 on "platypus2" (a);
 0 rows inserted/updated/deleted
-ij> create index echidna2 on "platypus2" (c);
+ij(CONNECTION1)> create index echidna2 on "platypus2" (c);
 0 rows inserted/updated/deleted
-ij> create index wallaby2 on "platypus2" (a,c,d) ;
+ij(CONNECTION1)> create index wallaby2 on "platypus2" (a,c,d) ;
 0 rows inserted/updated/deleted
-ij> select conglomeratename, isindex, numallocatedpages, numfreepages, pagesize, estimspacesaving
+ij(CONNECTION1)> select conglomeratename, isindex, numallocatedpages, numfreepages, pagesize, estimspacesaving
 	from new org.apache.derby.diag.SpaceTable('platypus2') t
 	order by conglomeratename;
 CONGLOMERATENAME                                                                                                                |ISIND&|NUMALLOCATEDPAGES   |NUMFREEPAGES        |PAGESIZE   |ESTIMSPACESAVING    
@@ -178,7 +178,7 @@ ECHIDNA2                                
 KOOKABURRA2                                                                                                                     |1     |1                   |0                   |4096       |0                   
 WALLABY2                                                                                                                        |1     |1                   |0                   |4096       |0                   
 platypus2                                                                                                                       |0     |6                   |0                   |4096       |0                   
-ij> select conglomeratename, isindex, numallocatedpages, numfreepages, pagesize, estimspacesaving
+ij(CONNECTION1)> select conglomeratename, isindex, numallocatedpages, numfreepages, pagesize, estimspacesaving
     from SYS.SYSSCHEMAS s,
          SYS.SYSTABLES t,
          new org.apache.derby.diag.SpaceTable(SCHEMANAME,TABLENAME) v
@@ -196,46 +196,46 @@ PLATYPUS                                
 WALLABY                                                                                                                         |1     |15                  |1                   |4096       |4096                
 WALLABY2                                                                                                                        |1     |1                   |0                   |4096       |0                   
 platypus2                                                                                                                       |0     |6                   |0                   |4096       |0                   
-ij> drop table platypus;
+ij(CONNECTION1)> drop table platypus;
 0 rows inserted/updated/deleted
-ij> drop table "platypus2";
+ij(CONNECTION1)> drop table "platypus2";
 0 rows inserted/updated/deleted
-ij> autocommit off;
-ij> drop table foo_int;
+ij(CONNECTION1)> autocommit off;
+ij(CONNECTION1)> drop table foo_int;
 ERROR 42Y55: 'DROP TABLE' cannot be performed on 'FOO_INT' because it does not exist.
-ij> create table foo_int (a int);
+ij(CONNECTION1)> create table foo_int (a int);
 0 rows inserted/updated/deleted
-ij> drop table foo_char;
+ij(CONNECTION1)> drop table foo_char;
 ERROR 42Y55: 'DROP TABLE' cannot be performed on 'FOO_CHAR' because it does not exist.
-ij> create table foo_char (a char(100)) ;
+ij(CONNECTION1)> create table foo_char (a char(100)) ;
 0 rows inserted/updated/deleted
-ij> drop table foo_varchar;
+ij(CONNECTION1)> drop table foo_varchar;
 ERROR 42Y55: 'DROP TABLE' cannot be performed on 'FOO_VARCHAR' because it does not exist.
-ij> create table foo_varchar (a varchar(32000)) ;
+ij(CONNECTION1)> create table foo_varchar (a varchar(32000)) ;
 0 rows inserted/updated/deleted
-ij> -- let the foo_longxxx get created at 32K
+ij(CONNECTION1)> -- let the foo_longxxx get created at 32K
 call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.storage.pageSize', NULL);
 0 rows inserted/updated/deleted
-ij> drop table foo_longvarchar;
+ij(CONNECTION1)> drop table foo_longvarchar;
 ERROR 42Y55: 'DROP TABLE' cannot be performed on 'FOO_LONGVARCHAR' because it does not exist.
-ij> create table foo_longvarchar (a long varchar);
+ij(CONNECTION1)> create table foo_longvarchar (a long varchar);
 0 rows inserted/updated/deleted
-ij> drop table foo_longvarbinary;
+ij(CONNECTION1)> drop table foo_longvarbinary;
 ERROR 42Y55: 'DROP TABLE' cannot be performed on 'FOO_LONGVARBINARY' because it does not exist.
-ij> create table foo_longvarbinary (a long varchar for bit data);
+ij(CONNECTION1)> create table foo_longvarbinary (a long varchar for bit data);
 0 rows inserted/updated/deleted
-ij> -- Back to 4K
+ij(CONNECTION1)> -- Back to 4K
 call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.storage.pageSize', '4096');
 0 rows inserted/updated/deleted
-ij> drop table foo_bit;
+ij(CONNECTION1)> drop table foo_bit;
 ERROR 42Y55: 'DROP TABLE' cannot be performed on 'FOO_BIT' because it does not exist.
-ij> create table foo_bit (a CHAR(100) FOR BIT DATA) ;
+ij(CONNECTION1)> create table foo_bit (a CHAR(100) FOR BIT DATA) ;
 0 rows inserted/updated/deleted
-ij> drop table foo_varbinary;
+ij(CONNECTION1)> drop table foo_varbinary;
 ERROR 42Y55: 'DROP TABLE' cannot be performed on 'FOO_VARBINARY' because it does not exist.
-ij> create table foo_varbinary (a VARCHAR(10000) FOR BIT DATA) ;
+ij(CONNECTION1)> create table foo_varbinary (a VARCHAR(10000) FOR BIT DATA) ;
 0 rows inserted/updated/deleted
-ij> select v.CONGLOMERATENAME, PAGESIZE
+ij(CONNECTION1)> select v.CONGLOMERATENAME, PAGESIZE
 from SYS.SYSSCHEMAS s,
 SYS.SYSTABLES t,
 new org.apache.derby.diag.SpaceTable(SCHEMANAME,TABLENAME) v
@@ -250,45 +250,45 @@ FOO_LONGVARBINARY                       
 FOO_LONGVARCHAR                                                                                                                 |32768      
 FOO_VARBINARY                                                                                                                   |4096       
 FOO_VARCHAR                                                                                                                     |4096       
-ij> drop table foo_int;
+ij(CONNECTION1)> drop table foo_int;
 0 rows inserted/updated/deleted
-ij> call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.storage.pageReservedSpace','65');
+ij(CONNECTION1)> call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.storage.pageReservedSpace','65');
 0 rows inserted/updated/deleted
-ij> create table foo_int (a int);
+ij(CONNECTION1)> create table foo_int (a int);
 0 rows inserted/updated/deleted
-ij> drop table foo_char;
+ij(CONNECTION1)> drop table foo_char;
 0 rows inserted/updated/deleted
-ij> create table foo_char (a char(100));
+ij(CONNECTION1)> create table foo_char (a char(100));
 0 rows inserted/updated/deleted
-ij> drop table foo_varchar;
+ij(CONNECTION1)> drop table foo_varchar;
 0 rows inserted/updated/deleted
-ij> create table foo_varchar (a varchar(10000));
+ij(CONNECTION1)> create table foo_varchar (a varchar(10000));
 0 rows inserted/updated/deleted
-ij> -- let the foo_longxxx get created at 32K
+ij(CONNECTION1)> -- let the foo_longxxx get created at 32K
 call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.storage.pageSize', NULL);
 0 rows inserted/updated/deleted
-ij> drop table foo_longvarchar;
+ij(CONNECTION1)> drop table foo_longvarchar;
 0 rows inserted/updated/deleted
-ij> create table foo_longvarchar (a long varchar) ;
+ij(CONNECTION1)> create table foo_longvarchar (a long varchar) ;
 0 rows inserted/updated/deleted
-ij> drop table foo_longvarbinary;
+ij(CONNECTION1)> drop table foo_longvarbinary;
 0 rows inserted/updated/deleted
-ij> create table foo_longvarbinary (a long varchar for bit data) ;
+ij(CONNECTION1)> create table foo_longvarbinary (a long varchar for bit data) ;
 0 rows inserted/updated/deleted
-ij> -- Back to 4K
+ij(CONNECTION1)> -- Back to 4K
 call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.storage.pageSize', '4096');
 0 rows inserted/updated/deleted
-ij> drop table foo_bit;
+ij(CONNECTION1)> drop table foo_bit;
 0 rows inserted/updated/deleted
-ij> create table foo_bit (a CHAR(100) FOR BIT DATA ) ;
+ij(CONNECTION1)> create table foo_bit (a CHAR(100) FOR BIT DATA ) ;
 0 rows inserted/updated/deleted
-ij> drop table foo_varbinary;
+ij(CONNECTION1)> drop table foo_varbinary;
 0 rows inserted/updated/deleted
-ij> create table foo_varbinary (a VARCHAR(10000) FOR BIT DATA) ;
+ij(CONNECTION1)> create table foo_varbinary (a VARCHAR(10000) FOR BIT DATA) ;
 0 rows inserted/updated/deleted
-ij> call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.storage.pageReservedSpace',NULL);
+ij(CONNECTION1)> call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.storage.pageReservedSpace',NULL);
 0 rows inserted/updated/deleted
-ij> select v.CONGLOMERATENAME, PAGESIZE
+ij(CONNECTION1)> select v.CONGLOMERATENAME, PAGESIZE
 from SYS.SYSSCHEMAS s,
 SYS.SYSTABLES t,
 new org.apache.derby.diag.SpaceTable(SCHEMANAME,TABLENAME) v
@@ -303,38 +303,38 @@ FOO_LONGVARBINARY                       
 FOO_LONGVARCHAR                                                                                                                 |32768      
 FOO_VARBINARY                                                                                                                   |4096       
 FOO_VARCHAR                                                                                                                     |4096       
-ij> --  8K pagesize 
+ij(CONNECTION1)> --  8K pagesize 
 call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.storage.pageSize', '8192');
 0 rows inserted/updated/deleted
-ij> drop table foo_int;
+ij(CONNECTION1)> drop table foo_int;
 0 rows inserted/updated/deleted
-ij> create table foo_int (a int);
+ij(CONNECTION1)> create table foo_int (a int);
 0 rows inserted/updated/deleted
-ij> drop table foo_char;
+ij(CONNECTION1)> drop table foo_char;
 0 rows inserted/updated/deleted
-ij> create table foo_char (a char(100));
+ij(CONNECTION1)> create table foo_char (a char(100));
 0 rows inserted/updated/deleted
-ij> drop table foo_varchar;
+ij(CONNECTION1)> drop table foo_varchar;
 0 rows inserted/updated/deleted
-ij> create table foo_varchar (a varchar(10000));
+ij(CONNECTION1)> create table foo_varchar (a varchar(10000));
 0 rows inserted/updated/deleted
-ij> drop table foo_longvarchar;
+ij(CONNECTION1)> drop table foo_longvarchar;
 0 rows inserted/updated/deleted
-ij> create table foo_longvarchar (a long varchar);
+ij(CONNECTION1)> create table foo_longvarchar (a long varchar);
 0 rows inserted/updated/deleted
-ij> drop table foo_bit;
+ij(CONNECTION1)> drop table foo_bit;
 0 rows inserted/updated/deleted
-ij> create table foo_bit (a CHAR(100) FOR BIT DATA);
+ij(CONNECTION1)> create table foo_bit (a CHAR(100) FOR BIT DATA);
 0 rows inserted/updated/deleted
-ij> drop table foo_varbinary;
+ij(CONNECTION1)> drop table foo_varbinary;
 0 rows inserted/updated/deleted
-ij> create table foo_varbinary (a varchar(10000) FOR BIT DATA);
+ij(CONNECTION1)> create table foo_varbinary (a varchar(10000) FOR BIT DATA);
 0 rows inserted/updated/deleted
-ij> drop table foo_longvarbinary;
+ij(CONNECTION1)> drop table foo_longvarbinary;
 0 rows inserted/updated/deleted
-ij> create table foo_longvarbinary (a long varchar for bit data);
+ij(CONNECTION1)> create table foo_longvarbinary (a long varchar for bit data);
 0 rows inserted/updated/deleted
-ij> select v.CONGLOMERATENAME, PAGESIZE
+ij(CONNECTION1)> select v.CONGLOMERATENAME, PAGESIZE
 from SYS.SYSSCHEMAS s,
 SYS.SYSTABLES t,
 new org.apache.derby.diag.SpaceTable(SCHEMANAME,TABLENAME) v
@@ -349,38 +349,38 @@ FOO_LONGVARBINARY                       
 FOO_LONGVARCHAR                                                                                                                 |8192       
 FOO_VARBINARY                                                                                                                   |8192       
 FOO_VARCHAR                                                                                                                     |8192       
-ij> call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.storage.pageSize', '4096');
+ij(CONNECTION1)> call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.storage.pageSize', '4096');
 0 rows inserted/updated/deleted
-ij> commit;
-ij> drop table foo_int;
+ij(CONNECTION1)> commit;
+ij(CONNECTION1)> drop table foo_int;
 0 rows inserted/updated/deleted
-ij> create table foo_int (a int);
+ij(CONNECTION1)> create table foo_int (a int);
 0 rows inserted/updated/deleted
-ij> drop table foo_char;
+ij(CONNECTION1)> drop table foo_char;
 0 rows inserted/updated/deleted
-ij> create table foo_char (a char(100)) ;
+ij(CONNECTION1)> create table foo_char (a char(100)) ;
 0 rows inserted/updated/deleted
-ij> drop table foo_varchar;
+ij(CONNECTION1)> drop table foo_varchar;
 0 rows inserted/updated/deleted
-ij> create table foo_varchar (a varchar(10000));
+ij(CONNECTION1)> create table foo_varchar (a varchar(10000));
 0 rows inserted/updated/deleted
-ij> drop table foo_longvarchar;
+ij(CONNECTION1)> drop table foo_longvarchar;
 0 rows inserted/updated/deleted
-ij> create table foo_longvarchar (a long varchar);
+ij(CONNECTION1)> create table foo_longvarchar (a long varchar);
 0 rows inserted/updated/deleted
-ij> drop table foo_bit;
+ij(CONNECTION1)> drop table foo_bit;
 0 rows inserted/updated/deleted
-ij> create table foo_bit (a CHAR(100) for bit data);
+ij(CONNECTION1)> create table foo_bit (a CHAR(100) for bit data);
 0 rows inserted/updated/deleted
-ij> drop table foo_varbinary;
+ij(CONNECTION1)> drop table foo_varbinary;
 0 rows inserted/updated/deleted
-ij> create table foo_varbinary (a varchar(10000) for bit data);
+ij(CONNECTION1)> create table foo_varbinary (a varchar(10000) for bit data);
 0 rows inserted/updated/deleted
-ij> drop table foo_longvarbinary;
+ij(CONNECTION1)> drop table foo_longvarbinary;
 0 rows inserted/updated/deleted
-ij> create table foo_longvarbinary (a long varchar for bit data);
+ij(CONNECTION1)> create table foo_longvarbinary (a long varchar for bit data);
 0 rows inserted/updated/deleted
-ij> select v.CONGLOMERATENAME, PAGESIZE
+ij(CONNECTION1)> select v.CONGLOMERATENAME, PAGESIZE
 from SYS.SYSSCHEMAS s,
 SYS.SYSTABLES t,
 new org.apache.derby.diag.SpaceTable(SCHEMANAME,TABLENAME) v
@@ -395,6 +395,6 @@ FOO_LONGVARBINARY                       
 FOO_LONGVARCHAR                                                                                                                 |4096       
 FOO_VARBINARY                                                                                                                   |4096       
 FOO_VARCHAR                                                                                                                     |4096       
-ij> commit;
-ij> disconnect;
-ij> 
+ij(CONNECTION1)> commit;
+ij(CONNECTION1)> disconnect;
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/bug3498.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/bug3498.out?rev=1443812&r1=1443811&r2=1443812&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/bug3498.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/bug3498.out Fri Feb  8 00:51:09 2013
@@ -1,4 +1,4 @@
-ij> --
+ij(CONNECTION1)> --
 --   Licensed to the Apache Software Foundation (ASF) under one or more
 --   contributor license agreements.  See the NOTICE file distributed with
 --   this work for additional information regarding copyright ownership.
@@ -22,301 +22,303 @@ ij> --
 -- row.  Make this happen by just creating A LOT of tables and making them
 -- all expand.  One of them will hit the problem, this test reproducibly
 -- showed the problem which was fixed by p4 change 16867.
+
 -- separate test because this counts heavily on the layout on the pages,
 -- of the system catalogs to make the right circumstance come about.
+
 autocommit off;
-ij> -- create a test table to make sure rollback works right.
+ij(CONNECTION1)> -- create a test table to make sure rollback works right.
 create table testabort (a int);
 0 rows inserted/updated/deleted
-ij> -- create a lot of tables so that there is at least one page in SYSTABLES
+ij(CONNECTION1)> -- create a lot of tables so that there is at least one page in SYSTABLES
 -- with just these rows.  The subsequent INSERT will expand every row, making
 -- one of them move part of the row off the page.
 create table foo000000 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000001 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000001 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000002 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000002 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000003 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000003 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000004 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000004 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000005 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000005 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000006 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000006 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000007 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000007 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000008 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000008 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000009 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000009 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000010 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000010 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000011 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000011 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000012 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000012 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000013 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000013 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000014 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000014 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000015 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000015 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000016 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000016 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000017 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000017 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000018 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000018 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000019 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000019 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000020 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000020 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000021 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000021 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000022 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000022 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000023 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000023 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000024 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000024 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000025 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000025 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000026 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000026 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000027 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000027 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000028 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000028 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000029 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000029 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000030 (keycol int, a00001111 int generated always as identity);
+ij(CONNECTION1)> create table foo000030 (keycol int, a00001111 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000031 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000031 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000032 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000032 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000033 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000033 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000034 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000034 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000035 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000035 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000036 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000036 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000037 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000037 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000038 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000038 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000039 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000039 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000040 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000040 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000041 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000041 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000042 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000042 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000043 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000043 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000044 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000044 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000045 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000045 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000046 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000046 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000047 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000047 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000048 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000048 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000049 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000049 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000050 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000050 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000051 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000051 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000052 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000052 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000053 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000053 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000054 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000054 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000055 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000055 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000056 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000056 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000057 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000057 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000058 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000058 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000059 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000059 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000060 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000060 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000061 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000061 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000062 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000062 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000063 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000063 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000064 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000064 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000065 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000065 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000066 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000066 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000067 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000067 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000068 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000068 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> create table foo000069 (keycol int, a000 int generated always as identity);
+ij(CONNECTION1)> create table foo000069 (keycol int, a000 int generated always as identity);
 0 rows inserted/updated/deleted
-ij> commit;
-ij> insert into testabort values (1);
+ij(CONNECTION1)> commit;
+ij(CONNECTION1)> insert into testabort values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000000 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000000 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000001 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000001 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000002 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000002 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000003 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000003 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000004 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000004 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000005 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000005 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000006 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000006 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000007 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000007 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000008 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000008 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000009 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000009 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000010 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000010 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000011 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000011 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000012 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000012 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000013 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000013 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000014 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000014 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000015 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000015 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000016 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000016 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000017 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000017 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000018 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000018 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000019 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000019 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000020 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000020 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000021 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000021 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000022 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000022 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000023 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000023 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000024 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000024 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000025 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000025 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000026 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000026 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000027 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000027 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000028 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000028 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000029 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000029 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000030 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000030 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000031 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000031 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000032 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000032 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000033 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000033 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000034 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000034 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000035 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000035 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000036 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000036 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000037 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000037 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000038 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000038 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000039 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000039 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000040 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000040 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000041 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000041 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000042 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000042 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000043 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000043 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000044 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000044 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000045 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000045 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000046 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000046 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000047 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000047 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000048 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000048 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000049 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000049 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000050 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000050 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000051 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000051 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000052 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000052 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000053 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000053 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000054 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000054 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000055 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000055 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000056 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000056 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000057 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000057 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000058 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000058 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000059 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000059 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000060 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000060 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000061 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000061 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000062 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000062 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000063 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000063 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000064 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000064 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000065 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000065 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000066 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000066 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000067 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000067 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000068 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000068 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> insert into foo000069 (keycol) values (1);
+ij(CONNECTION1)> insert into foo000069 (keycol) values (1);
 1 row inserted/updated/deleted
-ij> rollback;
-ij> select * from testabort;
+ij(CONNECTION1)> rollback;
+ij(CONNECTION1)> select * from testabort;
 A          
 -----------
-ij> commit;
-ij> 
+ij(CONNECTION1)> commit;
+ij(CONNECTION1)> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cisco.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cisco.out?rev=1443812&r1=1443811&r2=1443812&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cisco.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cisco.out Fri Feb  8 00:51:09 2013
@@ -1,4 +1,4 @@
-ij> --
+ij(CONNECTION1)> --
 --   Licensed to the Apache Software Foundation (ASF) under one or more
 --   contributor license agreements.  See the NOTICE file distributed with
 --   this work for additional information regarding copyright ownership.
@@ -18,11 +18,12 @@ ij> --
 -- Test multi user lock interaction of ddl. 
 --------------------------------------------------------------------------------
 autocommit off;
-ij> connect 'wombat' as create1;
+ij(CONNECTION1)> connect 'wombat' as create1;
 ij(CREATE1)> connect 'wombat' as create2;
 ij(CREATE2)> --------------------------------------------------------------------------------
 -- Test 0: create1:serializable, create2:serializable
 --------------------------------------------------------------------------------
+
 -- set up
 set connection create1;
 ij(CREATE1)> autocommit off;
@@ -62,7 +63,7 @@ ERROR 42Y55: 'DROP TABLE' cannot be perf
 ij(CREATE2)> set current isolation = serializable;
 0 rows inserted/updated/deleted
 ij(CREATE2)> commit;
-ij(CREATE2)> run resource 'cisco.subsql';
+ij(CREATE2)> run resource '/org/apache/derbyTesting/functionTests/tests/store/cisco.subsql';
 ij(CREATE2)> --
 --   Licensed to the Apache Software Foundation (ASF) under one or more
 --   contributor license agreements.  See the NOTICE file distributed with
@@ -82,6 +83,7 @@ ij(CREATE2)> --
 --------------------------------------------------------------------------------
 -- Test 0.1: ddl interaction
 --------------------------------------------------------------------------------
+
 -- create 1st table.  Drop the table, which will get regular X locks on the
 -- rows in the system catalogs (which are different than insert locks).
 set connection create1;
@@ -104,6 +106,7 @@ ij(CREATE2)> ---------------------------
 --           if create1 session isolation is serializable, otherwise it will
 --           not block.
 --------------------------------------------------------------------------------
+
 -- get lock on range of keys 0->10, iso level determines if phantoms allowed.
 set connection create1;
 ij(CREATE1)> select * from data where keycol <= 10;
@@ -127,6 +130,7 @@ ij(CREATE1)> set connection create1;
 ij(CREATE1)> commit;
 ij(CREATE1)> delete from data where keycol = 5;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij(CREATE1)> commit;
 ij(CREATE1)> set connection create2;
 ij(CREATE2)> commit;
@@ -135,6 +139,7 @@ ij(CREATE2)> ---------------------------
 --           if create1 session isolation is serializable, otherwise it will
 --           not block.
 --------------------------------------------------------------------------------
+
 -- get lock on range of keys 0->10, iso level determines if phantoms allowed.
 set connection create1;
 ij(CREATE1)> delete from data where keycol <= 10;
@@ -153,12 +158,14 @@ ij(CREATE1)> set connection create1;
 ij(CREATE1)> commit;
 ij(CREATE1)> delete from data where keycol = 6;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij(CREATE1)> commit;
 ij(CREATE1)> set connection create2;
 ij(CREATE2)> commit;
 ij(CREATE2)> --------------------------------------------------------------------------------
 -- Test 1: create1:serializable, create2:repeatable read
 --------------------------------------------------------------------------------
+
 -- set up
 set connection create1;
 ij(CREATE1)> autocommit off;
@@ -198,7 +205,7 @@ ij(CREATE2)> drop table create2;
 ij(CREATE2)> set isolation RS;
 0 rows inserted/updated/deleted
 ij(CREATE2)> commit;
-ij(CREATE2)> run resource 'cisco.subsql';
+ij(CREATE2)> run resource '/org/apache/derbyTesting/functionTests/tests/store/cisco.subsql';
 ij(CREATE2)> --
 --   Licensed to the Apache Software Foundation (ASF) under one or more
 --   contributor license agreements.  See the NOTICE file distributed with
@@ -218,6 +225,7 @@ ij(CREATE2)> --
 --------------------------------------------------------------------------------
 -- Test 0.1: ddl interaction
 --------------------------------------------------------------------------------
+
 -- create 1st table.  Drop the table, which will get regular X locks on the
 -- rows in the system catalogs (which are different than insert locks).
 set connection create1;
@@ -240,6 +248,7 @@ ij(CREATE2)> ---------------------------
 --           if create1 session isolation is serializable, otherwise it will
 --           not block.
 --------------------------------------------------------------------------------
+
 -- get lock on range of keys 0->10, iso level determines if phantoms allowed.
 set connection create1;
 ij(CREATE1)> select * from data where keycol <= 10;
@@ -263,6 +272,7 @@ ij(CREATE1)> set connection create1;
 ij(CREATE1)> commit;
 ij(CREATE1)> delete from data where keycol = 5;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij(CREATE1)> commit;
 ij(CREATE1)> set connection create2;
 ij(CREATE2)> commit;
@@ -271,6 +281,7 @@ ij(CREATE2)> ---------------------------
 --           if create1 session isolation is serializable, otherwise it will
 --           not block.
 --------------------------------------------------------------------------------
+
 -- get lock on range of keys 0->10, iso level determines if phantoms allowed.
 set connection create1;
 ij(CREATE1)> delete from data where keycol <= 10;
@@ -289,12 +300,14 @@ ij(CREATE1)> set connection create1;
 ij(CREATE1)> commit;
 ij(CREATE1)> delete from data where keycol = 6;
 0 rows inserted/updated/deleted
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 ij(CREATE1)> commit;
 ij(CREATE1)> set connection create2;
 ij(CREATE2)> commit;
 ij(CREATE2)> --------------------------------------------------------------------------------
 -- Test 1: create1:repeatable read, create2:serializable
 --------------------------------------------------------------------------------
+
 -- set up
 set connection create1;
 ij(CREATE1)> autocommit off;
@@ -334,7 +347,7 @@ ij(CREATE2)> drop table create2;
 ij(CREATE2)> set isolation serializable;
 0 rows inserted/updated/deleted
 ij(CREATE2)> commit;
-ij(CREATE2)> run resource 'cisco.subsql';
+ij(CREATE2)> run resource '/org/apache/derbyTesting/functionTests/tests/store/cisco.subsql';
 ij(CREATE2)> --
 --   Licensed to the Apache Software Foundation (ASF) under one or more
 --   contributor license agreements.  See the NOTICE file distributed with
@@ -354,6 +367,7 @@ ij(CREATE2)> --
 --------------------------------------------------------------------------------
 -- Test 0.1: ddl interaction
 --------------------------------------------------------------------------------
+
 -- create 1st table.  Drop the table, which will get regular X locks on the
 -- rows in the system catalogs (which are different than insert locks).
 set connection create1;
@@ -376,6 +390,7 @@ ij(CREATE2)> ---------------------------
 --           if create1 session isolation is serializable, otherwise it will
 --           not block.
 --------------------------------------------------------------------------------
+
 -- get lock on range of keys 0->10, iso level determines if phantoms allowed.
 set connection create1;
 ij(CREATE1)> select * from data where keycol <= 10;
@@ -408,6 +423,7 @@ ij(CREATE2)> ---------------------------
 --           if create1 session isolation is serializable, otherwise it will
 --           not block.
 --------------------------------------------------------------------------------
+
 -- get lock on range of keys 0->10, iso level determines if phantoms allowed.
 set connection create1;
 ij(CREATE1)> delete from data where keycol <= 10;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/connectDisconnect.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/connectDisconnect.out?rev=1443812&r1=1443811&r2=1443812&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/connectDisconnect.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/connectDisconnect.out Fri Feb  8 00:51:09 2013
@@ -1,4 +1,4 @@
-ij> --
+ij(CONNECTION1)> --
 --   Licensed to the Apache Software Foundation (ASF) under one or more
 --   contributor license agreements.  See the NOTICE file distributed with
 --   this work for additional information regarding copyright ownership.
@@ -24,88 +24,88 @@ ij> --
 -- baseline case for add column test
 create table foo (a int);
 0 rows inserted/updated/deleted
-ij> insert into foo values (1);
+ij(CONNECTION1)> insert into foo values (1);
 1 row inserted/updated/deleted
-ij> insert into foo values (1, 2);
+ij(CONNECTION1)> insert into foo values (1, 2);
 ERROR 42802: The number of values assigned is not the same as the number of specified or implied columns.
-ij> select * from foo;
+ij(CONNECTION1)> select * from foo;
 A          
 -----------
 1          
-ij> -- baseline case of simple create/index test
+ij(CONNECTION1)> -- baseline case of simple create/index test
 create table foo2 (a int, b int, c int);
 0 rows inserted/updated/deleted
-ij> create index foo2_idx on foo2 (c);
+ij(CONNECTION1)> create index foo2_idx on foo2 (c);
 0 rows inserted/updated/deleted
-ij> insert into foo2 values (3, 30, 300);
+ij(CONNECTION1)> insert into foo2 values (3, 30, 300);
 1 row inserted/updated/deleted
-ij> insert into foo2 values (2, 20, 200);
+ij(CONNECTION1)> insert into foo2 values (2, 20, 200);
 1 row inserted/updated/deleted
-ij> insert into foo2 values (1, 10, 100);
+ij(CONNECTION1)> insert into foo2 values (1, 10, 100);
 1 row inserted/updated/deleted
-ij> disconnect;
+ij(CONNECTION1)> disconnect;
 ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> connect 'wombat' as conn1;
-ij> alter table foo add column b int;
+ij(CONN1)> alter table foo add column b int;
 0 rows inserted/updated/deleted
-ij> select * from foo;
+ij(CONN1)> select * from foo;
 A          |B          
 -----------------------
 1          |NULL       
-ij> insert into foo values (2, 1);
+ij(CONN1)> insert into foo values (2, 1);
 1 row inserted/updated/deleted
-ij> select * from foo;
+ij(CONN1)> select * from foo;
 A          |B          
 -----------------------
 1          |NULL       
 2          |1          
-ij> -- just make sure normal case works too.
+ij(CONN1)> -- just make sure normal case works too.
 select * from foo2;
 A          |B          |C          
 -----------------------------------
 3          |30         |300        
 2          |20         |200        
 1          |10         |100        
-ij> select c from foo2;
+ij(CONN1)> select c from foo2;
 C          
 -----------
 100        
 200        
 300        
-ij> select c from foo2;
+ij(CONN1)> select c from foo2;
 C          
 -----------
 100        
 200        
 300        
-ij> disconnect;
+ij(CONN1)> disconnect;
 ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> connect 'wombat' as conn2;
-ij> -- does insert correctly pick up previous alter?
+ij(CONN2)> -- does insert correctly pick up previous alter?
 insert into foo values (2, 2);
 1 row inserted/updated/deleted
-ij> -- does alter correctly pick up previous alter?
+ij(CONN2)> -- does alter correctly pick up previous alter?
 alter table foo add column c int;
 0 rows inserted/updated/deleted
-ij> -- does select correctly pick up previous alter?
+ij(CONN2)> -- does select correctly pick up previous alter?
 select * from foo;
 A          |B          |C          
 -----------------------------------
 1          |NULL       |NULL       
 2          |1          |NULL       
 2          |2          |NULL       
-ij> insert into foo values (3, 1, 1);
+ij(CONN2)> insert into foo values (3, 1, 1);
 1 row inserted/updated/deleted
-ij> select * from foo;
+ij(CONN2)> select * from foo;
 A          |B          |C          
 -----------------------------------
 1          |NULL       |NULL       
 2          |1          |NULL       
 2          |2          |NULL       
 3          |1          |1          
-ij> disconnect;
+ij(CONN2)> disconnect;
 ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/heapscan.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/heapscan.out?rev=1443812&r1=1443811&r2=1443812&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/heapscan.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/heapscan.out Fri Feb  8 00:51:09 2013
@@ -1,4 +1,4 @@
-ij> --
+ij(CONNECTION1)> --
 --   Licensed to the Apache Software Foundation (ASF) under one or more
 --   contributor license agreements.  See the NOTICE file distributed with
 --   this work for additional information regarding copyright ownership.
@@ -17,8 +17,8 @@ ij> --
 --------------------------------------------------------------------------------
 -- Test multi user lock interaction of ddl. 
 --------------------------------------------------------------------------------
-run resource 'createTestProcedures.subsql';
-ij> --
+run resource '/org/apache/derbyTesting/functionTests/tests/store/createTestProcedures.subsql';
+ij(CONNECTION1)> --
 --   Licensed to the Apache Software Foundation (ASF) under one or more
 --   contributor license agreements.  See the NOTICE file distributed with
 --   this work for additional information regarding copyright ownership.
@@ -36,10 +36,10 @@ ij> --
 --
 CREATE FUNCTION  PADSTRING (DATA VARCHAR(32000), LENGTH INTEGER) RETURNS VARCHAR(32000) EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.Formatters.padString' LANGUAGE JAVA PARAMETER STYLE JAVA;
 0 rows inserted/updated/deleted
-ij> CREATE PROCEDURE WAIT_FOR_POST_COMMIT() DYNAMIC RESULT SETS 0 LANGUAGE JAVA EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.T_Access.waitForPostCommitToFinish' PARAMETER STYLE JAVA;
+ij(CONNECTION1)> CREATE PROCEDURE WAIT_FOR_POST_COMMIT() DYNAMIC RESULT SETS 0 LANGUAGE JAVA EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.T_Access.waitForPostCommitToFinish' PARAMETER STYLE JAVA;
 0 rows inserted/updated/deleted
-ij> autocommit off;
-ij> connect 'wombat' as deleter;
+ij(CONNECTION1)> autocommit off;
+ij(CONNECTION1)> connect 'wombat' as deleter;
 ij(DELETER)> -- by default, holdability of ResultSet objects created using this Connection object is true. Following will set it to false for this connection.
 NoHoldForConnection;
 ij(DELETER)> connect 'wombat' as scanner;
@@ -49,7 +49,7 @@ ij(SCANNER)> -- set up
 set connection scanner;
 ij(SCANNER)> set isolation CS;
 0 rows inserted/updated/deleted
-ij(SCANNER)> run resource 'LockTableQuery.subsql';
+ij(SCANNER)> run resource '/org/apache/derbyTesting/functionTests/tests/store/LockTableQuery.subsql';
 ij(SCANNER)> --
 --   Licensed to the Apache Software Foundation (ASF) under one or more
 --   contributor license agreements.  See the NOTICE file distributed with
@@ -84,6 +84,7 @@ on l.xid = t.xid where l.tableType <> 'S
 ij(SCANNER)> --on l.xid = t.xid where l.tableType <> 'S' or l.tableType is null
 -- order by
 --     tabname, type desc, mode, cnt, lockname
+
 -- lock table with system catalog locks included.
 create view full_lock_table as
 select 
@@ -159,6 +160,7 @@ ij(DELETER)> ---------------------------
 --         that the scanner is positioned on.  Then do a next on the scanner
 --         and verify the scanner goes to the last page.
 --------------------------------------------------------------------------------
+
 set connection scanner;
 ij(SCANNER)> create table just_to_block_on (a int);
 0 rows inserted/updated/deleted
@@ -255,6 +257,7 @@ ij> ------------------------------------
 --         for the row the scan is positioned on to be purged by post commit,
 --         but leave a row on the page for scan to reposition to.
 --------------------------------------------------------------------------------
+
 ---------------
 -- setup
 ---------------
@@ -313,6 +316,7 @@ ij(LOCKHOLDER)> commit;
 ij(LOCKHOLDER)> --------------
 -- run the test
 --------------
+
 set connection lockholder;
 ij(LOCKHOLDER)> create table just_to_block_on (a int);
 0 rows inserted/updated/deleted
@@ -332,11 +336,13 @@ KEYCOL     
 -----------
 10         
 ij(SCANNER)> -- scan is now positioned on row (10, 100), as it group fetched 2 rows.
+
 -- in deleter1 thread delete the last row on the page, but don't commit.
 -- in the other deleter thread delete the rest of the rows on the page and
 -- commit it, which will result in a post commit to try and reclaim all the
 -- rows on the page, but it won't be able to reclaim the one that has not
 -- been committed by deleter1.
+
 -- delete in this transaction keycol (30, 300).
 set connection deleter1;
 ij(DELETER1)> delete from data where keycol = 30;
@@ -408,6 +414,7 @@ ij> ------------------------------------
 --         This time make the row left on the page be deleted, so when the
 --         scan repositions, it should jump over the deleted row.
 --------------------------------------------------------------------------------
+
 ---------------
 -- setup
 ---------------
@@ -464,6 +471,7 @@ ij(LOCKHOLDER)> commit;
 ij(LOCKHOLDER)> --------------
 -- run the test
 --------------
+
 set connection lockholder;
 ij(LOCKHOLDER)> create table just_to_block_on (a int);
 0 rows inserted/updated/deleted
@@ -483,11 +491,13 @@ KEYCOL     
 -----------
 10         
 ij(SCANNER)> -- scan is now positioned on row (10, 100), as it group fetched 2 rows.
+
 -- In the deleter1 thread delete the last row on the page, but don't commit.
 -- in the other deleter thread delete the rest of the rows on the page and
 -- commit it, which will result in a post commit to try and reclaim all the
 -- rows on the page, but it won't be able to reclaim the one that has not
 -- been committed by deleter1.
+
 -- delete in this transaction keycol (30, 300).
 set connection deleter1;
 ij(DELETER1)> delete from data where keycol = 30;
@@ -561,6 +571,7 @@ ij> ------------------------------------
 --         "next" row on the page, find that no such row exists on the page,
 --         and finally move to the next page.
 --------------------------------------------------------------------------------
+
 ---------------
 -- setup
 ---------------
@@ -617,6 +628,7 @@ ij(LOCKHOLDER)> commit;
 ij(LOCKHOLDER)> --------------
 -- run the test
 --------------
+
 set connection lockholder;
 ij(LOCKHOLDER)> create table just_to_block_on (a int);
 0 rows inserted/updated/deleted
@@ -652,6 +664,7 @@ KEYCOL     
 -----------
 50         
 ij(SCANNER)> -- scan is now positioned on row (50, 500), as it group fetched in 2 row chunks.
+
 -- In the deleter1 thread delete the 1st row on the page, but don't commit:
 -- (40, 400).
 -- In the deleter2 thread delete the current row and the rows following on the
@@ -659,6 +672,7 @@ ij(SCANNER)> -- scan is now positioned o
 -- the code seeing a page with all rows deleted and then queue a post commit on
 -- the page which will purge 50, 60, and 70, but it won't be able to reclaim 
 -- the one that has not been committed by deleter1.
+
 -- delete in this transaction keycol (30, 300).
 set connection deleter1;
 ij(DELETER1)> delete from data where keycol = 40;
@@ -722,6 +736,7 @@ ij> ------------------------------------
 --         for all rows in the table to be purged.  The reposition code will
 --         attempt to position on the "next" page, and find no more pages.
 --------------------------------------------------------------------------------
+
 ---------------
 -- setup
 ---------------
@@ -778,6 +793,7 @@ ij(LOCKHOLDER)> commit;
 ij(LOCKHOLDER)> --------------
 -- run the test
 --------------
+
 set connection lockholder;
 ij(LOCKHOLDER)> create table just_to_block_on (a int);
 0 rows inserted/updated/deleted
@@ -813,8 +829,10 @@ KEYCOL     
 -----------
 50         
 ij(SCANNER)> -- scan is now positioned on row (50, 500), as it group fetched in 2 row chunks.
+
 -- In the deleter1 thread delete all the rows, allowing all rows/pages to be
 -- reclaimed.
+
 -- delete in this transaction all rows.
 set connection deleter1;
 ij(DELETER1)> delete from data where keycol >= 0 ;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/lockTableVti.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/lockTableVti.out?rev=1443812&r1=1443811&r2=1443812&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/lockTableVti.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/lockTableVti.out Fri Feb  8 00:51:09 2013
@@ -1,4 +1,4 @@
-ij> --
+ij(CONNECTION1)> --
 --   Licensed to the Apache Software Foundation (ASF) under one or more
 --   contributor license agreements.  See the NOTICE file distributed with
 --   this work for additional information regarding copyright ownership.
@@ -66,4 +66,4 @@ GRANT
 GRANT
 GRANT
 ij(C2)> commit;
-ij(C2)> 
+ij(C2)> 
\ No newline at end of file



Mime
View raw message