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 [5/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/removeStubs.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/removeStubs.out?rev=1443812&r1=1443811&r2=1443812&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/removeStubs.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/removeStubs.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,13 +18,13 @@ ij> --
 --removes the stub files are no longer necessary
 create table t1(a int ) ;
 0 rows inserted/updated/deleted
-ij> autocommit off ;
-ij> drop table t1 ;
+ij(CONNECTION1)> autocommit off ;
+ij(CONNECTION1)> drop table t1 ;
 0 rows inserted/updated/deleted
-ij> commit ;
-ij> connect 'wombat;shutdown=true';
+ij(CONNECTION1)> commit ;
+ij(CONNECTION1)> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
-ij> disconnect all;
+ij(CONNECTION1)> disconnect all;
 ij> connect 'wombat';
 ij> autocommit on;
 ij> create table t1(a int ) ;
@@ -150,4 +150,4 @@ ij> CALL SYSCS_UTIL.SYSCS_CHECKPOINT_DAT
 0 rows inserted/updated/deleted
 ij> CALL SYSCS_UTIL.SYSCS_CHECKPOINT_DATABASE();
 0 rows inserted/updated/deleted
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rlliso1multi.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rlliso1multi.out?rev=1443812&r1=1443811&r2=1443812&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rlliso1multi.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rlliso1multi.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.
@@ -21,15 +21,17 @@ ij> --
 --    test is run 4 times each with the second user running in a different 
 --    isolation level.
 ------------------------------------------------------------------------------
+
 ------------------------------------------------------------------------------
 -- TEST READ COMMITTED INTERACTION:
 ------------------------------------------------------------------------------
+
 connect 'wombat' as writer;
 ij(WRITER)> autocommit off;
 ij(WRITER)> set isolation CS;
 0 rows inserted/updated/deleted
 ij(WRITER)> commit;
-ij(WRITER)> run resource 'rlliso1multi.subsql';
+ij(WRITER)> run resource '/org/apache/derbyTesting/functionTests/tests/store/rlliso1multi.subsql';
 ij(WRITER)> --
 --   Licensed to the Apache Software Foundation (ASF) under one or more
 --   contributor license agreements.  See the NOTICE file distributed with
@@ -60,6 +62,7 @@ ij(WRITER)> --
 --  TEST 2: test RU(read uncommitted) ddl interaction
 --
 ------------------------------------------------------------------------------
+
 -- SCRIPT SETUP
 connect 'wombat' as iso_read_uncommitted;
 ij(ISO_READ_UNCOMMITTED)> autocommit off;
@@ -67,6 +70,7 @@ ij(ISO_READ_UNCOMMITTED)> commit;
 ij(ISO_READ_UNCOMMITTED)> ------------------------------------------------------------------------------
 --  TEST 0: test RU(read uncommitted) heap read interaction insert/delete/update
 ------------------------------------------------------------------------------
+
 -- set up
 set connection iso_read_uncommitted;
 ij(ISO_READ_UNCOMMITTED)> autocommit off;
@@ -155,6 +159,7 @@ ij(WRITER)> commit;
 ij(WRITER)> ------------------------------------------------------------------------------
 --  TEST 1: test RU(read uncommitted) heap read interaction insert/delete/update
 ------------------------------------------------------------------------------
+
 -- set up
 set connection iso_read_uncommitted;
 ij(ISO_READ_UNCOMMITTED)> autocommit off;
@@ -243,6 +248,7 @@ ij(WRITER)> commit;
 ij(WRITER)> ------------------------------------------------------------------------------
 --  TEST 2: test RU(read uncommitted) ddl interaction
 ------------------------------------------------------------------------------
+
 -- set up
 set connection iso_read_uncommitted;
 ij(ISO_READ_UNCOMMITTED)> autocommit off;
@@ -311,7 +317,7 @@ ij(WRITER)> autocommit off;
 ij(WRITER)> set isolation RR;
 0 rows inserted/updated/deleted
 ij(WRITER)> commit;
-ij(WRITER)> run resource 'rlliso1multi.subsql';
+ij(WRITER)> run resource '/org/apache/derbyTesting/functionTests/tests/store/rlliso1multi.subsql';
 ij(WRITER)> --
 --   Licensed to the Apache Software Foundation (ASF) under one or more
 --   contributor license agreements.  See the NOTICE file distributed with
@@ -342,6 +348,7 @@ ij(WRITER)> --
 --  TEST 2: test RU(read uncommitted) ddl interaction
 --
 ------------------------------------------------------------------------------
+
 -- SCRIPT SETUP
 connect 'wombat' as iso_read_uncommitted;
 ij(ISO_READ_UNCOMMITTED)> autocommit off;
@@ -349,6 +356,7 @@ ij(ISO_READ_UNCOMMITTED)> commit;
 ij(ISO_READ_UNCOMMITTED)> ------------------------------------------------------------------------------
 --  TEST 0: test RU(read uncommitted) heap read interaction insert/delete/update
 ------------------------------------------------------------------------------
+
 -- set up
 set connection iso_read_uncommitted;
 ij(ISO_READ_UNCOMMITTED)> autocommit off;
@@ -440,6 +448,7 @@ ij(WRITER)> commit;
 ij(WRITER)> ------------------------------------------------------------------------------
 --  TEST 1: test RU(read uncommitted) heap read interaction insert/delete/update
 ------------------------------------------------------------------------------
+
 -- set up
 set connection iso_read_uncommitted;
 ij(ISO_READ_UNCOMMITTED)> autocommit off;
@@ -528,6 +537,7 @@ ij(WRITER)> commit;
 ij(WRITER)> ------------------------------------------------------------------------------
 --  TEST 2: test RU(read uncommitted) ddl interaction
 ------------------------------------------------------------------------------
+
 -- set up
 set connection iso_read_uncommitted;
 ij(ISO_READ_UNCOMMITTED)> autocommit off;
@@ -596,7 +606,7 @@ ij(WRITER)> autocommit off;
 ij(WRITER)> set current isolation = RS;
 0 rows inserted/updated/deleted
 ij(WRITER)> commit;
-ij(WRITER)> run resource 'rlliso1multi.subsql';
+ij(WRITER)> run resource '/org/apache/derbyTesting/functionTests/tests/store/rlliso1multi.subsql';
 ij(WRITER)> --
 --   Licensed to the Apache Software Foundation (ASF) under one or more
 --   contributor license agreements.  See the NOTICE file distributed with
@@ -627,6 +637,7 @@ ij(WRITER)> --
 --  TEST 2: test RU(read uncommitted) ddl interaction
 --
 ------------------------------------------------------------------------------
+
 -- SCRIPT SETUP
 connect 'wombat' as iso_read_uncommitted;
 ij(ISO_READ_UNCOMMITTED)> autocommit off;
@@ -634,6 +645,7 @@ ij(ISO_READ_UNCOMMITTED)> commit;
 ij(ISO_READ_UNCOMMITTED)> ------------------------------------------------------------------------------
 --  TEST 0: test RU(read uncommitted) heap read interaction insert/delete/update
 ------------------------------------------------------------------------------
+
 -- set up
 set connection iso_read_uncommitted;
 ij(ISO_READ_UNCOMMITTED)> autocommit off;
@@ -732,6 +744,7 @@ ij(WRITER)> commit;
 ij(WRITER)> ------------------------------------------------------------------------------
 --  TEST 1: test RU(read uncommitted) heap read interaction insert/delete/update
 ------------------------------------------------------------------------------
+
 -- set up
 set connection iso_read_uncommitted;
 ij(ISO_READ_UNCOMMITTED)> autocommit off;
@@ -820,6 +833,7 @@ ij(WRITER)> commit;
 ij(WRITER)> ------------------------------------------------------------------------------
 --  TEST 2: test RU(read uncommitted) ddl interaction
 ------------------------------------------------------------------------------
+
 -- set up
 set connection iso_read_uncommitted;
 ij(ISO_READ_UNCOMMITTED)> autocommit off;
@@ -883,12 +897,13 @@ ij(ISO_READ_UNCOMMITTED)> disconnect;
 ij> ------------------------------------------------------------------------------
 -- TEST READ UNCOMMITTED INTERACTION:
 ------------------------------------------------------------------------------
+
 connect 'wombat' as writer;
 ij(WRITER)> autocommit off;
 ij(WRITER)> set isolation UR;
 0 rows inserted/updated/deleted
 ij(WRITER)> commit;
-ij(WRITER)> run resource 'rlliso1multi.subsql';
+ij(WRITER)> run resource '/org/apache/derbyTesting/functionTests/tests/store/rlliso1multi.subsql';
 ij(WRITER)> --
 --   Licensed to the Apache Software Foundation (ASF) under one or more
 --   contributor license agreements.  See the NOTICE file distributed with
@@ -919,6 +934,7 @@ ij(WRITER)> --
 --  TEST 2: test RU(read uncommitted) ddl interaction
 --
 ------------------------------------------------------------------------------
+
 -- SCRIPT SETUP
 connect 'wombat' as iso_read_uncommitted;
 ij(ISO_READ_UNCOMMITTED)> autocommit off;
@@ -926,6 +942,7 @@ ij(ISO_READ_UNCOMMITTED)> commit;
 ij(ISO_READ_UNCOMMITTED)> ------------------------------------------------------------------------------
 --  TEST 0: test RU(read uncommitted) heap read interaction insert/delete/update
 ------------------------------------------------------------------------------
+
 -- set up
 set connection iso_read_uncommitted;
 ij(ISO_READ_UNCOMMITTED)> autocommit off;
@@ -1028,6 +1045,7 @@ ij(WRITER)> commit;
 ij(WRITER)> ------------------------------------------------------------------------------
 --  TEST 1: test RU(read uncommitted) heap read interaction insert/delete/update
 ------------------------------------------------------------------------------
+
 -- set up
 set connection iso_read_uncommitted;
 ij(ISO_READ_UNCOMMITTED)> autocommit off;
@@ -1116,6 +1134,7 @@ ij(WRITER)> commit;
 ij(WRITER)> ------------------------------------------------------------------------------
 --  TEST 2: test RU(read uncommitted) ddl interaction
 ------------------------------------------------------------------------------
+
 -- set up
 set connection iso_read_uncommitted;
 ij(ISO_READ_UNCOMMITTED)> autocommit off;
@@ -1176,4 +1195,4 @@ ij(WRITER)> disconnect;
 ij> set connection iso_read_uncommitted;
 ij(ISO_READ_UNCOMMITTED)> commit;
 ij(ISO_READ_UNCOMMITTED)> disconnect;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rlliso2multi.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rlliso2multi.out?rev=1443812&r1=1443811&r2=1443812&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 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,8 +18,8 @@ ij> --
 -- Test multi user lock interaction under isolation level 2.  default isolation
 -- level has been set as a property to serializable.
 --------------------------------------------------------------------------------
-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.
@@ -37,14 +37,14 @@ 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> autocommit off;
-ij> -- by default, holdability of ResultSet objects created using this Connection object is true. Following will set it to false for this connection.
+ij(CONNECTION1)> autocommit off;
+ij(CONNECTION1)> -- by default, holdability of ResultSet objects created using this Connection object is true. Following will set it to false for this connection.
 NoHoldForConnection;
-ij> --------------------------------------------------------------------------------
+ij(CONNECTION1)> --------------------------------------------------------------------------------
 -- Test 0: verify isolation level by seeing if a read lock is released or not.
 --------------------------------------------------------------------------------
 connect 'wombat' as scanner;
@@ -102,6 +102,7 @@ ij(WRITER)> disconnect;
 ij> --------------------------------------------------------------------------------
 -- Test 1: make sure a leaf root growing get's the right lock.
 --------------------------------------------------------------------------------
+
 --------------------------------------------------------------------------------
 -- Test setup - create a 1 page btree, with the page ready to split.
 --------------------------------------------------------------------------------
@@ -229,12 +230,15 @@ ij(CLIENT_2)> --------------------------
 set connection client_1;
 ij(CLIENT_1)> update a set b = 'new value' where a > 'b' and a <= 'd';
 1 row inserted/updated/deleted
-ij(CLIENT_1)> -- run resource 'LockTableQuery.subsql';
+ij(CLIENT_1)> -- run resource '/org/apache/derbyTesting/functionTests/tests/store/LockTableQuery.subsql';
+
 set connection client_2;
 ij(CLIENT_2)> --------------------------------------------------------------------------------
+
 -- the following will not time out, the insert
 -- will get a previous key insert lock which will not conflict with the
 -- non-insert read-committed exclusive lock on 'c'.
+
 --------------------------------------------------------------------------------
 insert into a values (PADSTRING('d',1000), PADSTRING('d',1000));
 1 row inserted/updated/deleted
@@ -249,7 +253,8 @@ ij(CLIENT_2)> --------------------------
 --------------------------------------------------------------------------------
 insert into a values (PADSTRING('c',1000), PADSTRING('c',1000));
 ERROR 40XL1: A lock could not be obtained within the time requested
-ij(CLIENT_2)> -- run resource 'LockTableQuery.subsql';
+ij(CLIENT_2)> -- run resource '/org/apache/derbyTesting/functionTests/tests/store/LockTableQuery.subsql';
+
 --------------------------------------------------------------------------------
 -- cleanup.
 --------------------------------------------------------------------------------
@@ -338,6 +343,7 @@ ij(CLIENT_1)> --------------------------
 --         handles a row that is deleted after it has read a row from the index
 --         but before it has read the row from the base table.
 --------------------------------------------------------------------------------
+
 --------------------------------------------------------------------------------
 -- Test setup - create a 1 page btre, with the page ready to split.
 --------------------------------------------------------------------------------
@@ -436,7 +442,9 @@ ij> ------------------------------------
 -- Test 6: make sure a that heap scans which cross page boundaries release
 --         locks correctly.
 --------------------------------------------------------------------------------
+
 -- Test setup - create a heap with one row per page.
+
 connect 'wombat' as scanner;
 ij(SCANNER)> -- by default, holdability of ResultSet objects created using this Connection object is true. Following will set it to false for this connection.
 NoHoldForConnection;
@@ -539,7 +547,9 @@ ij> ------------------------------------
 --         point there was a problem where releasing locks in one of the cursors
 --         released locks in the other cursor).
 --------------------------------------------------------------------------------
+
 -- Test setup - create a heap with one row per page.
+
 connect 'wombat' as scanner;
 ij(SCANNER)> -- by default, holdability of ResultSet objects created using this Connection object is true. Following will set it to false for this connection.
 NoHoldForConnection;
@@ -651,6 +661,7 @@ ij> ------------------------------------
 --               client continue on with work.
 --
 --------------------------------------------------------------------------------
+
 --------------------------------------------------------------------------------
 -- 8.1 setup 
 --------------------------------------------------------------------------------
@@ -675,6 +686,7 @@ ij(CLIENT_1)> --------------------------
 -- 8.1 test - simply delete rows from table, heap post commit will run and 
 --            reclaim all pages.
 --------------------------------------------------------------------------------
+
 set connection client_1;
 ij(CLIENT_1)> delete from test_8;
 5 rows inserted/updated/deleted
@@ -707,6 +719,7 @@ ij(CLIENT_1)> commit;
 ij(CLIENT_1)> --------------------------------------------------------------------------------
 -- 8.2 test - client 1 holds row lock which will prevent client 2 post commit.
 --------------------------------------------------------------------------------
+
 set connection client_1;
 ij(CLIENT_1)> insert into test_8 values (6, 60, PADSTRING('a',1000), 'test 8.2');
 1 row inserted/updated/deleted
@@ -753,6 +766,7 @@ ij(CLIENT_2)> --------------------------
 -- 8.3 test - simply delete rows from index table, btree post commit will run
 --            and reclaim all pages.
 --------------------------------------------------------------------------------
+
 set connection client_1;
 ij(CLIENT_1)> delete from test_8;
 5 rows inserted/updated/deleted
@@ -787,6 +801,7 @@ ij(CLIENT_1)> commit;
 ij(CLIENT_1)> --------------------------------------------------------------------------------
 -- 8.4 test - client 1 holds row lock which will prevent client 2 post commit.
 --------------------------------------------------------------------------------
+
 set connection client_1;
 ij(CLIENT_1)> insert into test_8 values (6, 60, PADSTRING('a',1500), 'test 8.4');
 1 row inserted/updated/deleted
@@ -811,6 +826,7 @@ ij(CLIENT_2)> commit;
 ij(CLIENT_2)> --------------------------------------------------------------------------------
 -- cleanup.
 --------------------------------------------------------------------------------
+
 set connection client_1;
 ij(CLIENT_1)> drop table test_8;
 0 rows inserted/updated/deleted
@@ -825,6 +841,7 @@ ij> ------------------------------------
 --         (Scan locks are no longer used after DERBY-2991.)
 --
 --------------------------------------------------------------------------------
+
 --------------------------------------------------------------------------------
 -- 9.1 setup 
 --------------------------------------------------------------------------------
@@ -859,6 +876,7 @@ ij(SCANNER)> ---------------------------
 -- 9.1 test - open a cursor for update on table, and make sure splitter waits
 --            on the scan position.
 --------------------------------------------------------------------------------
+
 set connection scanner;
 ij(SCANNER)> CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.language.bulkFetchDefault','1');
 0 rows inserted/updated/deleted
@@ -904,6 +922,7 @@ ij(SCANNER)> commit;
 ij(SCANNER)> --------------------------------------------------------------------------------
 -- cleanup.
 --------------------------------------------------------------------------------
+
 set connection scanner;
 ij(SCANNER)> drop table test_9;
 0 rows inserted/updated/deleted
@@ -915,6 +934,7 @@ ij(SPLITTER)> disconnect;
 ij> --------------------------------------------------------------------------------
 -- Test 10: Make sure a ddl does not block the lock table vti.
 --------------------------------------------------------------------------------
+
 --------------------------------------------------------------------------------
 -- 10 setup 
 --------------------------------------------------------------------------------
@@ -929,7 +949,7 @@ NoHoldForConnection;
 ij(LOCKTABLE)> autocommit off;
 ij(LOCKTABLE)> commit;
 ij(LOCKTABLE)> set connection ddl;
-ij(DDL)> run resource 'LockTableQuery.subsql';
+ij(DDL)> run resource '/org/apache/derbyTesting/functionTests/tests/store/LockTableQuery.subsql';
 ij(DDL)> --
 --   Licensed to the Apache Software Foundation (ASF) under one or more
 --   contributor license agreements.  See the NOTICE file distributed with
@@ -964,6 +984,7 @@ on l.xid = t.xid where l.tableType <> 'S
 ij(DDL)> --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 
@@ -1006,6 +1027,7 @@ ij(DDL)> -------------------------------
 -- 10 test - do ddl in one connection and look at lock table in another 
 --           connection.
 --------------------------------------------------------------------------------
+
 set connection ddl;
 ij(DDL)> create table test_10 (a int, a2 int, b varchar(1000), c char(10)) 
     ;
@@ -1029,6 +1051,7 @@ ij(LOCKTABLE)> commit;
 ij(LOCKTABLE)> --------------------------------------------------------------------------------
 -- cleanup.
 --------------------------------------------------------------------------------
+
 set connection ddl;
 ij(DDL)> drop table test_10;
 0 rows inserted/updated/deleted
@@ -1040,6 +1063,7 @@ ij(LOCKTABLE)> disconnect;
 ij> --------------------------------------------------------------------------------
 -- Test 11: test update locks
 --------------------------------------------------------------------------------
+
 connect 'wombat' as t11scanner;
 ij(T11SCANNER)> -- by default, holdability of ResultSet objects created using this Connection object is true. Following will set it to false for this connection.
 NoHoldForConnection;
@@ -1070,6 +1094,7 @@ ij(T11UPDATER)> --
 --==================================================
 -- t11updater gets an update lock on row where a=1
 --==================================================
+
 get cursor update_cursor as
     'select b from test_11 where a=1 for update of b';
 ij(T11UPDATER)> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
@@ -1187,6 +1212,7 @@ ij(T11SCANNER)> --
 --==================================================
 -- t11scanner gets a read lock
 --==================================================
+
 select b from test_11 where a=1;
 B          
 -----------
@@ -1218,6 +1244,7 @@ ij(T11SCANNER)> --
 --==================================================
 -- t11writer gets a write lock
 --==================================================
+
 set connection t11writer;
 ij(T11WRITER)> autocommit off;
 ij(T11WRITER)> update test_11 set b=77 where a=2;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rlliso3multi.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rlliso3multi.out?rev=1443812&r1=1443811&r2=1443812&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 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,6 +18,7 @@ ij> --
 -- Test multi user lock interaction under isolation level 3.  default isolation
 -- level has been set as a property to serializable.
 --------------------------------------------------------------------------------
+
 --------------------------------------------------------------------------------
 -- Test 0: verify isolation level by seeing if a read lock is released or not.
 --------------------------------------------------------------------------------
@@ -31,7 +32,7 @@ ij(WRITER)> set isolation to rr;
 0 rows inserted/updated/deleted
 ij(WRITER)> -- by default, holdability of ResultSet objects created using this Connection object is true. Following will set it to false for this connection.
 NoHoldForConnection;
-ij(WRITER)> run resource 'createTestProcedures.subsql';
+ij(WRITER)> run resource '/org/apache/derbyTesting/functionTests/tests/store/createTestProcedures.subsql';
 ij(WRITER)> --
 --   Licensed to the Apache Software Foundation (ASF) under one or more
 --   contributor license agreements.  See the NOTICE file distributed with
@@ -96,6 +97,7 @@ ij(WRITER)> disconnect;
 ij> --------------------------------------------------------------------------------
 -- Test 1: make sure a leaf root growing get's the right lock.
 --------------------------------------------------------------------------------
+
 --------------------------------------------------------------------------------
 -- Test setup - create a 1 page btre, with the page ready to split.
 --------------------------------------------------------------------------------
@@ -217,9 +219,11 @@ ij(CLIENT_1)> insert into a values (PADS
 ij(CLIENT_1)> set connection client_2;
 ij(CLIENT_2)> autocommit off;
 ij(CLIENT_2)> --------------------------------------------------------------------------------
+
 -- the following will not cause a time out, as the previous
 -- key insert lock will not conflict with other insert locks, only other
 -- select locks, or non insert update locks.
+
 --------------------------------------------------------------------------------
 insert into a values (PADSTRING('c',1000), PADSTRING('c',1000));
 1 row inserted/updated/deleted
@@ -299,6 +303,7 @@ ij(CLIENT_1)> --------------------------
 --         scanner should hold the previous to first key lock until end of 
 --         transaction, thus blocking the attempted insert to the range.
 --------------------------------------------------------------------------------
+
 connect 'wombat' as scanner;
 ij(SCANNER)> set isolation to rr;
 0 rows inserted/updated/deleted
@@ -384,6 +389,7 @@ ij(SCANNER)> disconnect;
 ij> --------------------------------------------------------------------------------
 -- Test 6: test update locks
 --------------------------------------------------------------------------------
+
 connect 'wombat' as t6scanner;
 ij(T6SCANNER)> set isolation to rr;
 0 rows inserted/updated/deleted
@@ -399,7 +405,7 @@ ij(T6WRITER)> set isolation to rr;
 0 rows inserted/updated/deleted
 ij(T6WRITER)> -- by default, holdability of ResultSet objects created using this Connection object is true. Following will set it to false for this connection.
 NoHoldForConnection;
-ij(T6WRITER)> run resource 'LockTableQuery.subsql';
+ij(T6WRITER)> run resource '/org/apache/derbyTesting/functionTests/tests/store/LockTableQuery.subsql';
 ij(T6WRITER)> --
 --   Licensed to the Apache Software Foundation (ASF) under one or more
 --   contributor license agreements.  See the NOTICE file distributed with
@@ -434,6 +440,7 @@ on l.xid = t.xid where l.tableType <> 'S
 ij(T6WRITER)> --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 
@@ -492,6 +499,7 @@ ij(T6UPDATER)> --
 --==================================================
 -- t6updater gets an update lock on row where a=1
 --==================================================
+
 get cursor update_cursor as
     'select b from test_6 where a=1 for update of b';
 ij(T6UPDATER)> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
@@ -621,6 +629,7 @@ ij(T6SCANNER)> --
 --==================================================
 -- t6scanner gets a read lock
 --==================================================
+
 select b from test_6 where a=1;
 B          
 -----------
@@ -659,6 +668,7 @@ ij(T6SCANNER)> --
 --==================================================
 -- t6writer gets a write lock
 --==================================================
+
 set connection t6writer;
 ij(T6WRITER)> autocommit off;
 ij(T6WRITER)> update test_6 set b=77 where a=2;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testsqldecimal.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testsqldecimal.out?rev=1443812&r1=1443811&r2=1443812&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testsqldecimal.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testsqldecimal.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,247 +17,248 @@ ij> --
 -- This tests for the fix of a bug in the readExternal method of
 -- org.apache.derby.iapi.types.execution.SQLDecimal
 -- (Track # 2834)
+
 create table test_numeric (v numeric(31,28));
 0 rows inserted/updated/deleted
-ij> insert into test_numeric values(0.153659349252549204400963844818761572241783142089843750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.153659349252549204400963844818761572241783142089843750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.155519172871977917615993192157475277781486511230468750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.155519172871977917615993192157475277781486511230468750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.156845683349995823618883150629699230194091796875000000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.156845683349995823618883150629699230194091796875000000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.167771342363935538344321685144677758216857910156250000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.167771342363935538344321685144677758216857910156250000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.169551943407624583493031877878820523619651794433593750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.169551943407624583493031877878820523619651794433593750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.171827807248857933331009917310439050197601318359375000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.171827807248857933331009917310439050197601318359375000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.172725514170567251426291477400809526443481445312500000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.172725514170567251426291477400809526443481445312500000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.173790440056551531711193092633038759231567382812500000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.173790440056551531711193092633038759231567382812500000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.178284396304296932633803862700005993247032165527343750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.178284396304296932633803862700005993247032165527343750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.190443865345212404172059450502274557948112487792968750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.190443865345212404172059450502274557948112487792968750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.204708121258723396707068786781746894121170043945312500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.204708121258723396707068786781746894121170043945312500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.204925853612388464419780120806535705924034118652343750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.204925853612388464419780120806535705924034118652343750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.206782991393041903904759237775579094886779785156250000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.206782991393041903904759237775579094886779785156250000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.208975811755244267331477203697431832551956176757812500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.208975811755244267331477203697431832551956176757812500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.219113708053228051220173711044481024146080017089843750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.219113708053228051220173711044481024146080017089843750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.219350734394552437933612054621335119009017944335937500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.219350734394552437933612054621335119009017944335937500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.221012255176880945128914390807040035724639892578125000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.221012255176880945128914390807040035724639892578125000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.233852021438996970914558914955705404281616210937500000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.233852021438996970914558914955705404281616210937500000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.250165879091443721371490482852095738053321838378906250000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.250165879091443721371490482852095738053321838378906250000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.254732077306483950529525372985517606139183044433593750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.254732077306483950529525372985517606139183044433593750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.256652589621466642455516193876974284648895263671875000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.256652589621466642455516193876974284648895263671875000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.259177521128625021340496914490358904004096984863281250000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.259177521128625021340496914490358904004096984863281250000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.259711742936781675439306127373129129409790039062500000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.259711742936781675439306127373129129409790039062500000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.263426083107227371193914677860448136925697326660156250000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.263426083107227371193914677860448136925697326660156250000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.265153938284969137306745778914773836731910705566406250000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.265153938284969137306745778914773836731910705566406250000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.284394754291467433127138519921572878956794738769531250000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.284394754291467433127138519921572878956794738769531250000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.284501720963279192133654760255012661218643188476562500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.284501720963279192133654760255012661218643188476562500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.285773541682349141446195517346495762467384338378906250000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.285773541682349141446195517346495762467384338378906250000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.293670096014542747475672967993887141346931457519531250000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.293670096014542747475672967993887141346931457519531250000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.298141579351063668035237697040429338812828063964843750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.298141579351063668035237697040429338812828063964843750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.300830762733429235566973147797398269176483154296875000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.300830762733429235566973147797398269176483154296875000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.301480275672052488999952402082271873950958251953125000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.301480275672052488999952402082271873950958251953125000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.313410495834889335498019136139191687107086181640625000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.313410495834889335498019136139191687107086181640625000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.315596999671068245696403664624085649847984313964843750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.315596999671068245696403664624085649847984313964843750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.316767836466031571518442433443851768970489501953125000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.316767836466031571518442433443851768970489501953125000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.319831561014056187097764905047370120882987976074218750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.319831561014056187097764905047370120882987976074218750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.321581867590551295776890583510976284742355346679687500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.321581867590551295776890583510976284742355346679687500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.330044919065760167242729039571713656187057495117187500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.330044919065760167242729039571713656187057495117187500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.340170172948979998572838212567148730158805847167968750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.340170172948979998572838212567148730158805847167968750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.343023330195411535470384478685446083545684814453125000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.343023330195411535470384478685446083545684814453125000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.343528838909644917976038414053618907928466796875000000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.343528838909644917976038414053618907928466796875000000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.348038324953031108499601486983010545372962951660156250000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.348038324953031108499601486983010545372962951660156250000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.348176589940960012903303777420660480856895446777343750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.348176589940960012903303777420660480856895446777343750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.348387561880196816588295405381359159946441650390625000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.348387561880196816588295405381359159946441650390625000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.348957260513803158019641159626189619302749633789062500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.348957260513803158019641159626189619302749633789062500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.353760949608404873245603994291741400957107543945312500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.353760949608404873245603994291741400957107543945312500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.353904370909915555465374836785485967993736267089843750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.353904370909915555465374836785485967993736267089843750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.355196672070496766160374590981518849730491638183593750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.355196672070496766160374590981518849730491638183593750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.356598092009570155624942344729788601398468017578125000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.356598092009570155624942344729788601398468017578125000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.361891550398754757722485919657628983259201049804687500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.361891550398754757722485919657628983259201049804687500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.363017511046693774900973039621021598577499389648437500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.363017511046693774900973039621021598577499389648437500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.364295947573769596239401380444178357720375061035156250000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.364295947573769596239401380444178357720375061035156250000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.365173282132318477444243853824445977807044982910156250000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.365173282132318477444243853824445977807044982910156250000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.366457422041641223131591686978936195373535156250000000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.366457422041641223131591686978936195373535156250000000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.373406205230288557039841634832555428147315979003906250000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.373406205230288557039841634832555428147315979003906250000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.379451243731913856471749113552505150437355041503906250000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.379451243731913856471749113552505150437355041503906250000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.387571502139793078178797713917447254061698913574218750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.387571502139793078178797713917447254061698913574218750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.391076141514143826860561148350825533270835876464843750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.391076141514143826860561148350825533270835876464843750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.394079701321526587598498281295178458094596862792968750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.394079701321526587598498281295178458094596862792968750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.408450075488608899121345530147664248943328857421875000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.408450075488608899121345530147664248943328857421875000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.413805706051468047412811301910551264882087707519531250000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.413805706051468047412811301910551264882087707519531250000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.418969557566636341405796883918810635805130004882812500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.418969557566636341405796883918810635805130004882812500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.426813242129662429036329740483779460191726684570312500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.426813242129662429036329740483779460191726684570312500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.437034717190214694326755306974519044160842895507812500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.437034717190214694326755306974519044160842895507812500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.448146058677034719863740974687971174716949462890625000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.448146058677034719863740974687971174716949462890625000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.448560403250551353870889670361066237092018127441406250000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.448560403250551353870889670361066237092018127441406250000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.453820269616386329225576901080785319209098815917968750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.453820269616386329225576901080785319209098815917968750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.456269809786531088668937172769801691174507141113281250000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.456269809786531088668937172769801691174507141113281250000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.461855255922355767417286642739782109856605529785156250000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.461855255922355767417286642739782109856605529785156250000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.469232123754527163939087586186360567808151245117187500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.469232123754527163939087586186360567808151245117187500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.470105968957435504940178816468687728047370910644531250000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.470105968957435504940178816468687728047370910644531250000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.471049530443553798875200300244614481925964355468750000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.471049530443553798875200300244614481925964355468750000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.471801288954409425713265591184608638286590576171875000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.471801288954409425713265591184608638286590576171875000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.472098174014232152551073795621050521731376647949218750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.472098174014232152551073795621050521731376647949218750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.479998044300088966274131507816491648554801940917968750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.479998044300088966274131507816491648554801940917968750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.487510348557400718938481531949946656823158264160156250000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.487510348557400718938481531949946656823158264160156250000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.488344394316039820402863824710948392748832702636718750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.488344394316039820402863824710948392748832702636718750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.491453931889371697927515469928039237856864929199218750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.491453931889371697927515469928039237856864929199218750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.492811951393927194509103628661250695586204528808593750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.492811951393927194509103628661250695586204528808593750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.498686934685222960084161059057805687189102172851562500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.498686934685222960084161059057805687189102172851562500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.508551183317009658502172442240407690405845642089843750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.508551183317009658502172442240407690405845642089843750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.510021698576308746275742578291101381182670593261718750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.510021698576308746275742578291101381182670593261718750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.514641581305544493218917523336131125688552856445312500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.514641581305544493218917523336131125688552856445312500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.514838599259439644306723948830040171742439270019531250000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.514838599259439644306723948830040171742439270019531250000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.516254456787693660757554425799753516912460327148437500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.516254456787693660757554425799753516912460327148437500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.517424998087975929195181379327550530433654785156250000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.517424998087975929195181379327550530433654785156250000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.520617556348049959069612668827176094055175781250000000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.520617556348049959069612668827176094055175781250000000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.523540519518414626531921385321766138076782226562500000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.523540519518414626531921385321766138076782226562500000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.526207255428038367384147022676188498735427856445312500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.526207255428038367384147022676188498735427856445312500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.536035818449368539617694295884575694799423217773437500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.536035818449368539617694295884575694799423217773437500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.538519356120012004929265003738692030310630798339843750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.538519356120012004929265003738692030310630798339843750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.539919567857022331125449454702902585268020629882812500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.539919567857022331125449454702902585268020629882812500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.546738509435749198139831150911049917340278625488281250000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.546738509435749198139831150911049917340278625488281250000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.555397163378280045442636492225574329495429992675781250000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.555397163378280045442636492225574329495429992675781250000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.556609269078325530344386606884654611349105834960937500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.556609269078325530344386606884654611349105834960937500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.559546306378952973403784199035726487636566162109375000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.559546306378952973403784199035726487636566162109375000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.562659733610342049914265771803911775350570678710937500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.562659733610342049914265771803911775350570678710937500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.563120243089950678339050682552624493837356567382812500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.563120243089950678339050682552624493837356567382812500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.564708580310341101693438758957199752330780029296875000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.564708580310341101693438758957199752330780029296875000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.575994406119186841408463806146755814552307128906250000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.575994406119186841408463806146755814552307128906250000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.577354105251341342963655733910854905843734741210937500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.577354105251341342963655733910854905843734741210937500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.580863074718258265427550668391631916165351867675781250000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.580863074718258265427550668391631916165351867675781250000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.582986835256425472984176394675159826874732971191406250000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.582986835256425472984176394675159826874732971191406250000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.591042132949047616108373404131270945072174072265625000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.591042132949047616108373404131270945072174072265625000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.598743143052751891630691716272849589586257934570312500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.598743143052751891630691716272849589586257934570312500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.600505989779717141985315720376092940568923950195312500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.600505989779717141985315720376092940568923950195312500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.617877239310097192692694534343900159001350402832031250000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.617877239310097192692694534343900159001350402832031250000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.622180218573680554605687120783841237425804138183593750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.622180218573680554605687120783841237425804138183593750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.627353931494473160412894685578066855669021606445312500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.627353931494473160412894685578066855669021606445312500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.640540141483764813301604590378701686859130859375000000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.640540141483764813301604590378701686859130859375000000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.643952050290426791789855087699834257364273071289062500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.643952050290426791789855087699834257364273071289062500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.645499424366119400886532275762874633073806762695312500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.645499424366119400886532275762874633073806762695312500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.650971601226496998648940461862366646528244018554687500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.650971601226496998648940461862366646528244018554687500000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.651357394998915650852211456367513164877891540527343750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.651357394998915650852211456367513164877891540527343750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.656225638072990613558488348644459620118141174316406250000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.656225638072990613558488348644459620118141174316406250000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.658941700667530216861678127315826714038848876953125000000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.658941700667530216861678127315826714038848876953125000000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.661191909165676716675363877584459260106086730957031250000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.661191909165676716675363877584459260106086730957031250000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.666205794165350417834758900426095351576805114746093750000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.666205794165350417834758900426095351576805114746093750000000000000000);
 1 row inserted/updated/deleted
-ij> insert into test_numeric values(0.666413162385818269584092377044726163148880004882812500000000000000000);
+ij(CONNECTION1)> insert into test_numeric values(0.666413162385818269584092377044726163148880004882812500000000000000000);
 1 row inserted/updated/deleted
-ij> select v 
+ij(CONNECTION1)> select v 
 from test_numeric
 where v < 0.55
 order by v;
@@ -356,6 +357,6 @@ V                                
 0.5385193561200120049292650037   
 0.5399195678570223311254494547   
 0.5467385094357491981398311509   
-ij> drop table test_numeric;
+ij(CONNECTION1)> drop table test_numeric;
 0 rows inserted/updated/deleted
-ij> exit;
+ij(CONNECTION1)> exit;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/storemore.runall
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/storemore.runall?rev=1443812&r1=1443811&r2=1443812&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/storemore.runall (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/storemore.runall Fri Feb  8 00:51:09 2013
@@ -1,28 +1,11 @@
-store/cisco.sql
-store/connectDisconnect.sql
 store/databaseProperties.sql
-store/longRow.sql
 store/logDevice.sql
-store/Rllmodule1.sql
 store/Rllmodule2.sql
-store/Rllmodule3.sql
-store/Rllmodule4.sql
-store/RowLockIso.sql
-store/rlliso1multi.sql
-store/rlliso2multi.sql
-store/rlliso3multi.sql
 store/TransactionTable.sql
-store/SpaceTable.sql
-store/testsqldecimal.sql
-store/heapscan.sql
-store/removeStubs.sql
-store/lockTableVti.sql
 store/rollForwardBackup.sql
 store/rollForwardRecovery.sql
-store/readlocks.sql
 store/backupRestore.sql
 store/backupRestore1.java
-store/bug3498.sql
 store/Beetle6038.java
 store/TestDurabilityProperty.java
 store/OnlineCompressTest.java
@@ -32,4 +15,3 @@ store/OnlineBackupTest3.java
 store/onlineBackupTest4.sql
 store/BackupPathTests.java
 store/LogDeviceTest.java
-

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Rllmodule1.sql
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Rllmodule1.sql?rev=1443812&r1=1443811&r2=1443812&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Rllmodule1.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Rllmodule1.sql Fri Feb  8 00:51:09 2013
@@ -16,7 +16,7 @@
 --
 -- Test whether the RllRAMAccessmanager is working right (ie. forcing row 
 -- level locking). 
-run resource 'LockTableQuery.subsql';
+run resource '/org/apache/derbyTesting/functionTests/tests/store/LockTableQuery.subsql';
 
 autocommit off;
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Rllmodule3.sql
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Rllmodule3.sql?rev=1443812&r1=1443811&r2=1443812&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Rllmodule3.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Rllmodule3.sql Fri Feb  8 00:51:09 2013
@@ -16,7 +16,7 @@
 --
 -- Test whether the RllRAMAccessmanager is working right (ie. forcing row 
 -- level locking with no properties set). 
-run resource 'LockTableQuery.subsql';
+run resource '/org/apache/derbyTesting/functionTests/tests/store/LockTableQuery.subsql';
 
 autocommit off;
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Rllmodule4.sql
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Rllmodule4.sql?rev=1443812&r1=1443811&r2=1443812&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Rllmodule4.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Rllmodule4.sql Fri Feb  8 00:51:09 2013
@@ -16,7 +16,7 @@
 --
 -- Test whether the RllRAMAccessmanager is working right (ie. forcing row 
 -- level locking). 
-run resource 'LockTableQuery.subsql';
+run resource '/org/apache/derbyTesting/functionTests/tests/store/LockTableQuery.subsql';
 
 autocommit off;
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/RowLockIso.sql
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/RowLockIso.sql?rev=1443812&r1=1443811&r2=1443812&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/RowLockIso.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/RowLockIso.sql Fri Feb  8 00:51:09 2013
@@ -23,8 +23,8 @@
 --    print lock table which should match the master
 --    end transation
 -- 
-run resource 'createTestProcedures.subsql';
-run  resource 'LockTableQuery.subsql';
+run resource '/org/apache/derbyTesting/functionTests/tests/store/createTestProcedures.subsql';
+run  resource '/org/apache/derbyTesting/functionTests/tests/store/LockTableQuery.subsql';
 autocommit off;
 CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.storage.pageSize', '4096');
 create table a (a int, b int, c varchar(1900)) ;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/SpaceTable.sql
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/SpaceTable.sql?rev=1443812&r1=1443811&r2=1443812&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/SpaceTable.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/SpaceTable.sql Fri Feb  8 00:51:09 2013
@@ -19,7 +19,7 @@
 -- not consistent across runs, in particular for indexes, but also for
 -- tables. 
 -- Therefore tests do not report the numunfilledpages column
-run resource 'createTestProcedures.subsql';
+run resource '/org/apache/derbyTesting/functionTests/tests/store/createTestProcedures.subsql';
 call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.storage.pageSize', '4096');
 create table ideleteu (a varchar(2000), b varchar(2000)) ;
 insert into ideleteu values (PADSTRING('rrrrrrrrrr',2000), PADSTRING('ssssssssssssssss',2000));

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StoreScriptsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StoreScriptsTest.java?rev=1443812&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StoreScriptsTest.java (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StoreScriptsTest.java Fri Feb  8 00:51:09 2013
@@ -0,0 +1,160 @@
+/*
+
+   Derby - Class org.apache.derbyTesting.functionTests.tests.store.StoreScriptsTest
+
+   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.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+ */
+
+package org.apache.derbyTesting.functionTests.tests.store;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Properties;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.derbyTesting.functionTests.util.ScriptTestCase;
+import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
+import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
+import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
+
+public class StoreScriptsTest extends ScriptTestCase {
+    
+    /**
+     * Store SQL scripts (.sql files) that only run in embedded.
+     * Most tests that are testing SQL functionality can just 
+     * run in emebdded.
+     */
+    private static final String[] EMBEDDED_TESTS = {
+        /* in comments reasons why scripts from the storemore suite can/cannot be run like this*/
+        "cisco",        
+        "connectDisconnect", 
+        //"databaseProperties", // causes failures in AccessTest in EncryptionSuite
+        "longRow",
+        //"logDevice", // cannot run like this; test tries to set up 
+        // a separate logDevice by using ij.DataSource.connectionAttribute
+        // =logDevice=exitnout/weirdlog
+        "Rllmodule1", // note, original had the following properties:
+        // derby.module.access.rll=org.apache.derby.impl.store.RllRAMAccessManager.
+        // derby.storage.rowLocking=true 
+        // behavior is the same with them set, and without...
+        // "Rllmodule2",// cannot run as is, because needs special properties
+        // derby.module.access.rll=org.apache.derby.impl.store.RllRAMAccessManager.
+        // derby.storage.rowLocking=false
+        "Rllmodule3", 
+        "Rllmodule4", // note, original had special properties
+        // derby.module.access.rll=org.apache.derby.impl.store.RllRAMAccessManager.
+        // derby.storage.rowLocking=true 
+        // behavior is the same with them set, and without...
+        // might be able to get that set for a separate suite...
+        "RowLockIso",
+        "rlliso1multi",
+        "rlliso2multi",
+        "rlliso3multi", // note, original test had property 'derby.storage.rowLocking=true'
+        // "TransactionTable", // note, original test had property 'derby.storage.rowLocking=true'
+        //      but this cannot be run like this, because weme gives a different result than
+        //      ibm16 - there could be a timing issue, or it could be due to 
+        //      diffs between using datasource or drivermanager.
+        //      also note, this would set maximumdisplaywidth, and the setting would
+        //      remain for subsequent tests.
+        "SpaceTable", 
+        "testsqldecimal", // note, original test had properties set:
+        // derby.language.StatementCache=true
+        // derby.storage.sortBufferMax=78
+        // derby.debug.true=testSort
+        "heapscan", // note, original had properties set:
+        /*derby.storage.userLockTrace=true
+        derby.locks.deadlockTimeout=1
+        derby.locks.waitTimeout=5
+        #derby.infolog.append=true
+        derby.language.logStatementText=true
+        #derby.debug.true=userLockStackTrace,DeadlockTrace
+        #derby.debug.true=DeadlockTrace
+        #derby.debug.true=enableRowLocking,DeadlockTrace
+        derby.debug.true=verbose_heap_post_commit */
+        "removeStubs",
+        "lockTableVti", 
+        //"rollForwardBackup", has a _sed.properties file; connects to 
+        // multiple databases - needs to be fully converted.
+        // "rollForwardRecovery", original uses useextdirs=true, which
+        // includes separate processing in the old harness.
+        // also needs adjustment of run resource call 
+        "readlocks", 
+        //"backupRestore", // uses another database than wombat
+        "bug3498", 
+        //"onlineBackupTest2", // runs into lock time out 
+        //"onlineBackupTest4" // runs into security exception 
+        };
+
+    public StoreScriptsTest(String script) {
+        super(script, true);
+    }
+    
+    private static Test getSuite(String[] list)
+    {
+        TestSuite suite = new TestSuite("SQL scripts");
+        for (int i = 0; i < list.length; i++)
+            suite.addTest(
+                    new CleanDatabaseTestSetup(
+                    new StoreScriptsTest(list[i])));
+
+        return getIJConfig(suite);
+    }
+    
+    public static Test suite() {        
+        Properties props = new Properties();
+
+        // When running on JSR-169 platforms, we need to use a data source
+        // instead of a JDBC URL since DriverManager isn't available.
+        if (JDBC.vmSupportsJSR169()) {
+            props.setProperty("ij.dataSource",
+                              "org.apache.derby.jdbc.EmbeddedSimpleDataSource");
+            props.setProperty("ij.dataSource.databaseName", "wombat");
+            props.setProperty("ij.dataSource.createDatabase", "create");
+        }
+
+        props.setProperty("derby.infolog.append", "true");  
+        props.setProperty("ij.protocol", "jdbc:derby:");
+        props.setProperty("ij.database", "wombat;create=true");
+
+        Test test = new SystemPropertyTestSetup(
+                getSuite(EMBEDDED_TESTS), props);
+
+        // Lock timeout settings that were set for the old harness store tests
+        test = DatabasePropertyTestSetup.setLockTimeouts(test, 1, 4);
+        
+        TestSuite suite = new TestSuite("StoreScripts");
+        suite.addTest(test);
+
+        return getIJConfig(suite); 
+    }   
+    
+    protected void tearDown() throws Exception {
+        rollback();
+        Statement s = createStatement();
+        // Clear the database properties set by this test so that they
+        // don't affect other tests.
+        s.executeUpdate("CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.storage.pageSize', NULL)");
+        commit();
+
+        super.tearDown();
+    }
+
+}
\ No newline at end of file

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StoreScriptsTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/_Suite.java?rev=1443812&r1=1443811&r2=1443812&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/_Suite.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/_Suite.java Fri Feb  8 00:51:09 2013
@@ -83,6 +83,7 @@ public class _Suite extends BaseTestCase
         suite.addTest(ServicePropertiesFileTest.suite());
         suite.addTest(Derby5234Test.suite());
         suite.addTest(KeepDisposableStatsPropertyTest.suite());
+        suite.addTest(StoreScriptsTest.suite());
 
         /* Tests that only run in sane builds */
         if (SanityManager.DEBUG) {

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/cisco.sql
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/cisco.sql?rev=1443812&r1=1443811&r2=1443812&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/cisco.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/cisco.sql Fri Feb  8 00:51:09 2013
@@ -51,7 +51,7 @@ drop table create2;
 set current isolation = serializable;
 commit;
 
-run resource 'cisco.subsql';
+run resource '/org/apache/derbyTesting/functionTests/tests/store/cisco.subsql';
 
 --------------------------------------------------------------------------------
 -- Test 1: create1:serializable, create2:repeatable read
@@ -82,7 +82,7 @@ drop table create2;
 set isolation RS;
 commit;
 
-run resource 'cisco.subsql';
+run resource '/org/apache/derbyTesting/functionTests/tests/store/cisco.subsql';
 
 --------------------------------------------------------------------------------
 -- Test 1: create1:repeatable read, create2:serializable
@@ -113,7 +113,7 @@ drop table create2;
 set isolation serializable;
 commit;
 
-run resource 'cisco.subsql';
+run resource '/org/apache/derbyTesting/functionTests/tests/store/cisco.subsql';
 
 
 --------------------------------------------------------------------------------

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/heapscan.sql
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/heapscan.sql?rev=1443812&r1=1443811&r2=1443812&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/heapscan.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/heapscan.sql Fri Feb  8 00:51:09 2013
@@ -17,7 +17,7 @@
 --------------------------------------------------------------------------------
 -- Test multi user lock interaction of ddl. 
 --------------------------------------------------------------------------------
-run resource 'createTestProcedures.subsql';
+run resource '/org/apache/derbyTesting/functionTests/tests/store/createTestProcedures.subsql';
 autocommit off;
 
 connect 'wombat' as deleter;
@@ -31,7 +31,7 @@ NoHoldForConnection;
 -- set up
 set connection scanner;
 set isolation CS;
-run resource 'LockTableQuery.subsql';
+run resource '/org/apache/derbyTesting/functionTests/tests/store/LockTableQuery.subsql';
 autocommit off;
 drop table data;
 -- create a table with 2 rows per page.

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/longRow.sql
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/longRow.sql?rev=1443812&r1=1443811&r2=1443812&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/longRow.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/longRow.sql Fri Feb  8 00:51:09 2013
@@ -16,7 +16,7 @@
 --
 -- create a table with 5 rows, with 4K pageSize,
 -- this should expand over 3 pages
-run resource 'createTestProcedures.subsql';
+run resource '/org/apache/derbyTesting/functionTests/tests/store/createTestProcedures.subsql';
 call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.storage.pageSize', '4096');
 create table testing 
 	(a varchar(2024), b varchar(1024), c varchar(1024), d varchar(2048), e varchar(300)) ;
@@ -192,3 +192,4 @@ select * from testing where key4 = 4000 
 
 
 
+call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.storage.pageSize', 'NULL');



Mime
View raw message