You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ka...@apache.org on 2012/05/21 16:30:25 UTC

svn commit: r1341046 [4/6] - in /db/derby/code/trunk/java: drda/org/apache/derby/impl/drda/ engine/org/apache/derby/iapi/services/io/ engine/org/apache/derby/iapi/sql/ engine/org/apache/derby/iapi/types/ engine/org/apache/derby/impl/sql/execute/ shared...

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=1341046&r1=1341045&r2=1341046&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 Mon May 21 14:30:24 2012
@@ -949,7 +949,7 @@ ij(DDL)> --
 create view lock_table as
 select 
     cast(username as char(8)) as username,
-    cast(t.type as char(8)) as trantype,
+    cast(t.type as char(15)) as trantype,
     cast(l.type as char(8)) as type,
     cast(lockcount as char(3)) as cnt,
     mode,
@@ -1021,10 +1021,10 @@ ij(DDL)> insert into test_10 values (1, 
 ij(DDL)> set connection locktable;
 ij(LOCKTABLE)> -- this should not block on the other thread.
 select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-APP     |UserTran|TABLE   |4   |IX  |TEST_10     |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|TABLE   |1   |X   |TEST_10     |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |4   |IX  |TEST_10     |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|TABLE   |1   |X   |TEST_10     |Tablelock |GRANT|ACTIVE  
 ij(LOCKTABLE)> commit;
 ij(LOCKTABLE)> --------------------------------------------------------------------------------
 -- cleanup.
@@ -1064,8 +1064,8 @@ ij(T11UPDATER)> create index test11_idx 
 0 rows inserted/updated/deleted
 ij(T11UPDATER)> commit;
 ij(T11UPDATER)> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
 ij(T11UPDATER)> --
 --==================================================
 -- t11updater gets an update lock on row where a=1
@@ -1073,18 +1073,18 @@ ij(T11UPDATER)> --
 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;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-APP     |UserTran|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
 ij(T11UPDATER)> next update_cursor;
 B          
 -----------
 1          
 ij(T11UPDATER)> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-APP     |UserTran|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |TEST_11     |(1,7)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |TEST_11     |(1,7)     |GRANT|ACTIVE  
 ij(T11UPDATER)> set connection t11scanner;
 ij(T11SCANNER)> autocommit off;
 ij(T11SCANNER)> --
@@ -1098,10 +1098,10 @@ A          |B          
 2          |2          
 8          |8          
 ij(T11SCANNER)> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-APP     |UserTran|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |TEST_11     |(1,7)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |TEST_11     |(1,7)     |GRANT|ACTIVE  
 ij(T11SCANNER)> --
 --------------------------------------------------
 -- try to update the table, should timeout
@@ -1115,18 +1115,18 @@ ij(T11SCANNER)> --
 update test_11 set b=99 where a = 8;
 1 row inserted/updated/deleted
 ij(T11SCANNER)> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-APP     |UserTran|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|TABLE   |2   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |TEST_11     |(1,7)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |3   |X   |TEST_11     |(1,9)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|TABLE   |2   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |TEST_11     |(1,7)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |3   |X   |TEST_11     |(1,9)     |GRANT|ACTIVE  
 ij(T11SCANNER)> commit;
 ij(T11SCANNER)> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-APP     |UserTran|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |TEST_11     |(1,7)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |TEST_11     |(1,7)     |GRANT|ACTIVE  
 ij(T11SCANNER)> --
 --------------------------------------------------
 -- try to get an update lock
@@ -1134,11 +1134,11 @@ ij(T11SCANNER)> --
 get cursor update_cursor2 as
     'select b from test_11 where a=1 for update of b';
 ij(T11SCANNER)> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-APP     |UserTran|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |TEST_11     |(1,7)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |TEST_11     |(1,7)     |GRANT|ACTIVE  
 ij(T11SCANNER)> --
 --------------------------------------------------
 -- should timeout (other transaction has a shared lock on this row)
@@ -1146,10 +1146,10 @@ ij(T11SCANNER)> --
 next update_cursor2;
 ERROR 40XL1: A lock could not be obtained within the time requested
 ij(T11SCANNER)> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-APP     |UserTran|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |TEST_11     |(1,7)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |TEST_11     |(1,7)     |GRANT|ACTIVE  
 ij(T11SCANNER)> --
 --------------------------------------------------
 -- should succeed (no other transaction has a shared lock on this row)
@@ -1167,12 +1167,12 @@ B          
 -----------
 99         
 ij(T11SCANNER)> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-APP     |UserTran|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |TEST_11     |(1,7)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |TEST_11     |(1,9)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |TEST_11     |(1,7)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |TEST_11     |(1,9)     |GRANT|ACTIVE  
 ij(T11SCANNER)> commit;
 ij(T11SCANNER)> close update_cursor2;
 ij(T11SCANNER)> close update_cursor3;
@@ -1181,8 +1181,8 @@ ij(T11UPDATER)> commit;
 ij(T11UPDATER)> close update_cursor;
 ij(T11UPDATER)> set connection t11scanner;
 ij(T11SCANNER)> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
 ij(T11SCANNER)> --
 --==================================================
 -- t11scanner gets a read lock
@@ -1192,8 +1192,8 @@ B          
 -----------
 1          
 ij(T11SCANNER)> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
 ij(T11SCANNER)> --
 --------------------------------------------------
 -- should succeed (can get an update lock if there is already a shared lock)
@@ -1206,10 +1206,10 @@ B          
 -----------
 1          
 ij(T11UPDATER)> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-APP     |UserTran|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |TEST_11     |(1,7)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |TEST_11     |(1,7)     |GRANT|ACTIVE  
 ij(T11UPDATER)> commit;
 ij(T11UPDATER)> close update_cursor;
 ij(T11UPDATER)> set connection t11scanner;
@@ -1223,19 +1223,19 @@ ij(T11WRITER)> autocommit off;
 ij(T11WRITER)> update test_11 set b=77 where a=2;
 1 row inserted/updated/deleted
 ij(T11WRITER)> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-APP     |UserTran|TABLE   |2   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |3   |X   |TEST_11     |(1,8)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |2   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |3   |X   |TEST_11     |(1,8)     |GRANT|ACTIVE  
 ij(T11WRITER)> set connection t11updater;
 ij(T11UPDATER)> get cursor update_cursor as
     'select b from test_11 where a=2 for update of b';
 ij(T11UPDATER)> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-APP     |UserTran|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|TABLE   |2   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |3   |X   |TEST_11     |(1,8)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|TABLE   |2   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |3   |X   |TEST_11     |(1,8)     |GRANT|ACTIVE  
 ij(T11UPDATER)> --
 ----------------------------------------------------
 -- should timeout

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=1341046&r1=1341045&r2=1341046&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 Mon May 21 14:30:24 2012
@@ -419,7 +419,7 @@ ij(T6WRITER)> --
 create view lock_table as
 select 
     cast(username as char(8)) as username,
-    cast(t.type as char(8)) as trantype,
+    cast(t.type as char(15)) as trantype,
     cast(l.type as char(8)) as type,
     cast(lockcount as char(3)) as cnt,
     mode,
@@ -486,8 +486,8 @@ ij(T6UPDATER)> create index test6_idx on
 0 rows inserted/updated/deleted
 ij(T6UPDATER)> commit;
 ij(T6UPDATER)> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
 ij(T6UPDATER)> --
 --==================================================
 -- t6updater gets an update lock on row where a=1
@@ -495,19 +495,19 @@ ij(T6UPDATER)> --
 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;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-APP     |UserTran|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
 ij(T6UPDATER)> next update_cursor;
 B          
 -----------
 1          
 ij(T6UPDATER)> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-APP     |UserTran|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,3)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,7)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |TEST_6      |(1,3)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |TEST_6      |(1,7)     |GRANT|ACTIVE  
 ij(T6UPDATER)> set connection t6scanner;
 ij(T6SCANNER)> autocommit off;
 ij(T6SCANNER)> --
@@ -517,11 +517,11 @@ ij(T6SCANNER)> --
 select * from test_6;
 ERROR 40XL1: A lock could not be obtained within the time requested
 ij(T6SCANNER)> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-APP     |UserTran|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,3)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,7)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |TEST_6      |(1,3)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |TEST_6      |(1,7)     |GRANT|ACTIVE  
 ij(T6SCANNER)> --
 --------------------------------------------------
 -- try to update the table, should timeout
@@ -541,21 +541,21 @@ ij(T6SCANNER)> --
 update test_6 set b=99 where a = 8;
 1 row inserted/updated/deleted
 ij(T6SCANNER)> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-APP     |UserTran|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|TABLE   |2   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,3)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,7)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |TEST_6      |(1,8)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |3   |X   |TEST_6      |(1,9)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|TABLE   |2   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |TEST_6      |(1,3)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |TEST_6      |(1,7)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |X   |TEST_6      |(1,8)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |3   |X   |TEST_6      |(1,9)     |GRANT|ACTIVE  
 ij(T6SCANNER)> commit;
 ij(T6SCANNER)> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-APP     |UserTran|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,3)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,7)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |TEST_6      |(1,3)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |TEST_6      |(1,7)     |GRANT|ACTIVE  
 ij(T6SCANNER)> --
 --------------------------------------------------
 -- try to get an update lock
@@ -563,12 +563,12 @@ ij(T6SCANNER)> --
 get cursor update_cursor2 as
     'select b from test_6 where a=1 for update of b';
 ij(T6SCANNER)> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-APP     |UserTran|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,3)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,7)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |TEST_6      |(1,3)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |TEST_6      |(1,7)     |GRANT|ACTIVE  
 ij(T6SCANNER)> --
 --------------------------------------------------
 -- should timeout (other transaction has a shared lock on this row)
@@ -576,11 +576,11 @@ ij(T6SCANNER)> --
 next update_cursor2;
 ERROR 40XL1: A lock could not be obtained within the time requested
 ij(T6SCANNER)> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-APP     |UserTran|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,3)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,7)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |TEST_6      |(1,3)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |TEST_6      |(1,7)     |GRANT|ACTIVE  
 ij(T6SCANNER)> --
 --------------------------------------------------
 -- should succeed (no other transaction has a shared lock on this row)
@@ -599,14 +599,14 @@ B          
 -----------
 99         
 ij(T6SCANNER)> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-APP     |UserTran|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,3)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,7)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,8)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,9)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |TEST_6      |(1,3)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |TEST_6      |(1,7)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |TEST_6      |(1,8)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |TEST_6      |(1,9)     |GRANT|ACTIVE  
 ij(T6SCANNER)> commit;
 ij(T6SCANNER)> close update_cursor2;
 ij(T6SCANNER)> close update_cursor3;
@@ -615,8 +615,8 @@ ij(T6UPDATER)> commit;
 ij(T6UPDATER)> close update_cursor;
 ij(T6UPDATER)> set connection t6scanner;
 ij(T6SCANNER)> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
 ij(T6SCANNER)> --
 --==================================================
 -- t6scanner gets a read lock
@@ -626,11 +626,11 @@ B          
 -----------
 1          
 ij(T6SCANNER)> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-APP     |UserTran|TABLE   |1   |IS  |TEST_6      |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |TEST_6      |(1,3)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |TEST_6      |(1,7)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |TEST_6      |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |S   |TEST_6      |(1,3)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |S   |TEST_6      |(1,7)     |GRANT|ACTIVE  
 ij(T6SCANNER)> --
 --------------------------------------------------
 -- should succeed (can get an update lock if there is already a shared lock)
@@ -643,14 +643,14 @@ B          
 -----------
 1          
 ij(T6UPDATER)> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-APP     |UserTran|TABLE   |1   |IS  |TEST_6      |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |TEST_6      |(1,3)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |TEST_6      |(1,7)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,3)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,7)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |TEST_6      |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |S   |TEST_6      |(1,3)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |S   |TEST_6      |(1,7)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |TEST_6      |(1,3)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |TEST_6      |(1,7)     |GRANT|ACTIVE  
 ij(T6UPDATER)> commit;
 ij(T6UPDATER)> close update_cursor;
 ij(T6UPDATER)> set connection t6scanner;
@@ -664,21 +664,21 @@ ij(T6WRITER)> autocommit off;
 ij(T6WRITER)> update test_6 set b=77 where a=2;
 1 row inserted/updated/deleted
 ij(T6WRITER)> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-APP     |UserTran|TABLE   |2   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |TEST_6      |(1,7)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |3   |X   |TEST_6      |(1,8)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |2   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |X   |TEST_6      |(1,7)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |3   |X   |TEST_6      |(1,8)     |GRANT|ACTIVE  
 ij(T6WRITER)> set connection t6updater;
 ij(T6UPDATER)> get cursor update_cursor as
     'select b from test_6 where a=2 for update of b';
 ij(T6UPDATER)> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-APP     |UserTran|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|TABLE   |2   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |TEST_6      |(1,7)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |3   |X   |TEST_6      |(1,8)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|TABLE   |2   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |X   |TEST_6      |(1,7)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |3   |X   |TEST_6      |(1,8)     |GRANT|ACTIVE  
 ij(T6UPDATER)> --
 ----------------------------------------------------
 -- should timeout

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rollForwardRecovery.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rollForwardRecovery.out?rev=1341046&r1=1341045&r2=1341046&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rollForwardRecovery.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rollForwardRecovery.out Mon May 21 14:30:24 2012
@@ -1021,12 +1021,16 @@ create table testing (a int, b varchar(3
 0 rows inserted/updated/deleted
 ij> insert into testing values (1, PADSTRING('1 2 3 4 5 6 7 8 9 0',32384));
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
 ij> insert into testing values (2, PADSTRING('a b c d e f g h i j',32384));
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
 ij> insert into testing values (3, PADSTRING('11 22 33 44 55 66 77',32384));
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
 ij> insert into testing values (4, PADSTRING('aa bb cc dd ee ff gg',32384));
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
 ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
@@ -1066,12 +1070,16 @@ create table testing (a varchar(32384), 
 0 rows inserted/updated/deleted
 ij> insert into testing values (PADSTRING('1 2 3 4 5 6 7 8 9 0',32384), 1);
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
 ij> insert into testing values (PADSTRING('a b c d e f g h i j',32384), 2);
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
 ij> insert into testing values (PADSTRING('11 22 33 44 55 66 77',32384), 3);
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
 ij> insert into testing values (PADSTRING('aa bb cc dd ee ff gg',32384), 4);
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
 ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
@@ -1111,12 +1119,16 @@ create table testing (z int, a varchar(3
 0 rows inserted/updated/deleted
 ij> insert into testing values (0, PADSTRING('1 2 3 4 5 6 7 8 9 0',32384), 1);
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
 ij> insert into testing values (1, PADSTRING('a b c d e f g h i j',32384), 2);
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
 ij> insert into testing values (2, PADSTRING('11 22 33 44 55 66 77',32384), 3);
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
 ij> insert into testing values (4, PADSTRING('aa bb cc dd ee ff gg',32384), 4);
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
 ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
@@ -1161,14 +1173,34 @@ ERROR XSCB6: Limitation: Record of a btr
 ij> -- update the long column 5 times
 update testing set a = PADSTRING('update once',32384);
 4 rows inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> update testing set a = PADSTRING('update twice',32384);
 4 rows inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> update testing set a = PADSTRING('update three times',32384);
 4 rows inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> update testing set a = PADSTRING('update four times',32384);
 4 rows inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> update testing set a = PADSTRING('update five times',32384);
 4 rows inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
@@ -1189,12 +1221,20 @@ create table testing (a varchar(32384), 
 0 rows inserted/updated/deleted
 ij> insert into testing values (PADSTRING('1 2 3 4 5 6 7 8 9 0',32384), 1, PADSTRING('1 2 3 4 5 6 7 8 9 0',32084));
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> insert into testing values (PADSTRING('a b c d e f g h i j',32384), 2, PADSTRING('a b c d e f g h i j',32084));
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> insert into testing values (PADSTRING('11 22 33 44 55 66 77',32384), 3, PADSTRING('11 22 33 44 55 66 77',32084));
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> insert into testing values (PADSTRING('aa bb cc dd ee ff gg',32384), 4, PADSTRING('aa bb cc dd ee ff gg',32084));
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
@@ -1243,24 +1283,64 @@ ij> create index zz on testing (b);
 ij> -- update the last long column 10 times
 update testing set c = PADSTRING('update 0',32084);
 4 rows inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> update testing set c = PADSTRING('update 1',32084);
 4 rows inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> update testing set c = PADSTRING('update 2',32084);
 4 rows inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> update testing set c = PADSTRING('update 3',32084);
 4 rows inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> update testing set c = PADSTRING('update 4',32084);
 4 rows inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> update testing set c = PADSTRING('update 5',32084);
 4 rows inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> update testing set c = PADSTRING('update 6',32084);
 4 rows inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> update testing set c = PADSTRING('update 7',32084);
 4 rows inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> update testing set c = PADSTRING('update 8',32084);
 4 rows inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> update testing set c = PADSTRING('update 9',32084);
 4 rows inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
@@ -1281,20 +1361,36 @@ create table testing (a int, b clob(6476
 0 rows inserted/updated/deleted
 ij> insert into testing values (0, PADSTRING('1 2 3 4 5 6 7 8 9 0',64768),  1, PADSTRING('1 2 3 4 5 6 7 8 9 0',32384),  2);
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> insert into testing values (1, PADSTRING('a b c d e f g h i j',64768),  2, PADSTRING('a b c d e f g h i j',32384),  3);
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> insert into testing values (2, PADSTRING('11 22 33 44 55 66 77',64768), 3, PADSTRING('11 22 33 44 55 66 77',32384), 4);
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> insert into testing values (3, PADSTRING('aa bb cc dd ee ff gg',64768), 4, PADSTRING('aa bb cc dd ee ff gg',32384), 5);
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> insert into testing values (4, PADSTRING('1 2 3 4 5 6 7 8 9 0',64768),  5, PADSTRING('aa bb cc dd ee ff gg',32384), 6);
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> insert into testing values (5, PADSTRING('a b c d e f g h i j',64768),  6, PADSTRING('aa bb cc dd ee ff gg',32384), 7);
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> insert into testing values (6, PADSTRING('11 22 33 44 55 66 77',64768), 7, PADSTRING('aa bb cc dd ee ff gg',32384), 8);
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> insert into testing values (7, PADSTRING('aa bb cc dd ee ff gg',64768), 8, PADSTRING('aa bb cc dd ee ff gg',32384), 9);
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
@@ -1347,24 +1443,104 @@ A          |C          |D               
 ij> -- update column b 10 times
 update testing set b = PADSTRING('update 0',64768);
 8 rows inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> update testing set b = PADSTRING('update 1',64768);
 8 rows inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> update testing set b = PADSTRING('update 2',64768);
 8 rows inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> update testing set b = PADSTRING('update 3',64768);
 8 rows inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> update testing set b = PADSTRING('update 4',64768);
 8 rows inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> update testing set b = PADSTRING('update 5',64768);
 8 rows inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> update testing set b = PADSTRING('update 6',64768);
 8 rows inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> update testing set b = PADSTRING('update 7',64768);
 8 rows inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> update testing set b = PADSTRING('update 8',64768);
 8 rows inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> update testing set b = PADSTRING('update 9',64768);
 8 rows inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
@@ -1400,24 +1576,74 @@ create table testing (a clob(64768), b v
 0 rows inserted/updated/deleted
 ij> insert into testing values (PADSTRING('a a a a a a a a a a',64768), PADSTRING('b b b b b b b b b b',32384), PADSTRING('c c c c c c c c c c',64768), PADSTRING('d d d d d d d d d d',32384), PADSTRING('e e e e e e e e',64768));
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> insert into testing values (PADSTRING('a a a a a a a a a a',64768), PADSTRING('b b b b b b b b b b',32384), PADSTRING('c c c c c c c c c c',64768), PADSTRING('d d d d d d d d d d',32384), PADSTRING('e e e e e e e e',64768));
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> insert into testing values (PADSTRING('a a a a a a a a a a',64768), PADSTRING('b b b b b b b b b b',32384), PADSTRING('c c c c c c c c c c',64768), PADSTRING('d d d d d d d d d d',32384), PADSTRING('e e e e e e e e',64768));
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> insert into testing values (PADSTRING('a a a a a a a a a a',64768), PADSTRING('b b b b b b b b b b',32384), PADSTRING('c c c c c c c c c c',64768), PADSTRING('d d d d d d d d d d',32384), PADSTRING('e e e e e e e e',64768));
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> insert into testing values (PADSTRING('a a a a a a a a a a',64768), PADSTRING('b b b b b b b b b b',32384), PADSTRING('c c c c c c c c c c',64768), PADSTRING('d d d d d d d d d d',32384), PADSTRING('e e e e e e e e',64768));
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> insert into testing values (PADSTRING('a a a a a a a a a a',64768), PADSTRING('b b b b b b b b b b',32384), PADSTRING('c c c c c c c c c c',64768), PADSTRING('d d d d d d d d d d',32384), PADSTRING('e e e e e e e e',64768));
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> insert into testing values (PADSTRING('a a a a a a a a a a',64768), PADSTRING('b b b b b b b b b b',32384), PADSTRING('c c c c c c c c c c',64768), PADSTRING('d d d d d d d d d d',32384), PADSTRING('e e e e e e e e',64768));
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> insert into testing values (PADSTRING('a a a a a a a a a a',64768), PADSTRING('b b b b b b b b b b',32384), PADSTRING('c c c c c c c c c c',64768), PADSTRING('d d d d d d d d d d',32384), PADSTRING('e e e e e e e e',64768));
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> insert into testing values (PADSTRING('a a a a a a a a a a',64768), PADSTRING('b b b b b b b b b b',32384), PADSTRING('c c c c c c c c c c',64768), PADSTRING('d d d d d d d d d d',32384), PADSTRING('e e e e e e e e',64768));
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> insert into testing values (PADSTRING('a a a a a a a a a a',64768), PADSTRING('b b b b b b b b b b',32384), PADSTRING('c c c c c c c c c c',64768), PADSTRING('d d d d d d d d d d',32384), PADSTRING('e e e e e e e e',64768));
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> connect 'wombat;shutdown=true';
 ERROR 08006: Database 'wombat' shutdown.
 ij> disconnect;
@@ -1530,8 +1756,28 @@ b b b b b b b b b b                     
 ij> -- update the first and last column
 update testing set a = PADSTRING('1 1 1 1 1 1 1 1 1 1',64768);
 10 rows inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> update testing set e = PADSTRING('9 9 9 9 9 9 9 9 9 9',64768);
 10 rows inserted/updated/deleted
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> -- select should return 10 rows
 select a, e from testing;
 A                                                                                                                               |E                                                                                                                               

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/subqueryFlattening.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/subqueryFlattening.out?rev=1341046&r1=1341045&r2=1341046&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/subqueryFlattening.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/subqueryFlattening.out Mon May 21 14:30:24 2012
@@ -7165,6 +7165,7 @@ Attached subqueries:
 											Number of opens = 3
 											Rows returned = 3
 												constructor time (m
+WARNING 01004: Data truncation
 ij> select * from t1 where exists (select * from t2 where t1.c1=t2.c1 and t2.c1 not in (select t3.c1 from t3, t4));
 C1         
 -----------
@@ -7746,6 +7747,7 @@ Attached subqueries:
 											Number of opens = 3
 											Rows returned = 3
 												constructor time (milli
+WARNING 01004: Data truncation
 ij> drop table colls;
 0 rows inserted/updated/deleted
 ij> drop table docs;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerGeneral.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerGeneral.out?rev=1341046&r1=1341045&r2=1341046&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerGeneral.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/triggerGeneral.out Mon May 21 14:30:24 2012
@@ -835,12 +835,14 @@ ij> select id, cast (cl as clob(60)) fro
 ID         |2                                                           
 ------------------------------------------------------------------------
 0          |NULL                                                        
+WARNING 01004: Data truncation
 1          |Italy's centre-left leader Romano Prodi insists his poll vic
 2          |free                                                        
 ij> select id, cast (cl as clob(60)) from t438_t order by 1;
 ID         |2                                                           
 ------------------------------------------------------------------------
 0          |NULL                                                        
+WARNING 01004: Data truncation
 1          |Italy's centre-left leader Romano Prodi insists his poll vic
 2          |free                                                        
 ij> drop table t438;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/update.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/update.out?rev=1341046&r1=1341045&r2=1341046&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/update.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/update.out Mon May 21 14:30:24 2012
@@ -325,18 +325,30 @@ ij> select cast(c1 as char(5)), cast(c2 
 1    |2    |3    
 -----------------
 5th  |expan|5th  
+WARNING 01004: Data truncation
 5th  |expan|5th  
+WARNING 01004: Data truncation
 5th  |expan|5th  
+WARNING 01004: Data truncation
 5th  |expan|5th  
+WARNING 01004: Data truncation
 ij> update t1 set c3 = 'expandingxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx';
 4 rows inserted/updated/deleted
 ij> select cast(c1 as char(5)), cast(c2 as char(5)), cast(c3 as char(5)) from t1;
 1    |2    |3    
 -----------------
 5th  |expan|expan
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 5th  |expan|expan
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 5th  |expan|expan
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 5th  |expan|expan
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> update t1 set c2 = 'shrink';
 4 rows inserted/updated/deleted
 ij> update t1 set c3 = 'shrink';
@@ -345,9 +357,17 @@ ij> select cast(c1 as char(5)), cast(c2 
 1    |2    |3    
 -----------------
 5th  |shrin|shrin
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 5th  |shrin|shrin
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 5th  |shrin|shrin
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 5th  |shrin|shrin
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> update t1 set c2 = 'expandingxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
 			c3 = 'expandingxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx';
 4 rows inserted/updated/deleted
@@ -355,9 +375,17 @@ ij> select cast(c1 as char(5)), cast(c2 
 1    |2    |3    
 -----------------
 5th  |expan|expan
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 5th  |expan|expan
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 5th  |expan|expan
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 5th  |expan|expan
+WARNING 01004: Data truncation
+WARNING 01004: Data truncation
 ij> drop table t1;
 0 rows inserted/updated/deleted
 ij> create table t1 (c1 int, c2 int, c3 int, c4 int, c5 int, c6 int, c7 int, c8 int, c9 int);