db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r1465453 [1/5] - in /db/derby/code/branches/10.8.3.1_testcompat: ./ java/testing/org/apache/derbyTesting/functionTests/master/ java/testing/org/apache/derbyTesting/functionTests/tests/lang/ java/testing/org/apache/derbyTesting/functionTests...
Date Sun, 07 Apr 2013 20:10:24 GMT
Author: kmarsden
Date: Sun Apr  7 20:10:23 2013
New Revision: 1465453

URL: http://svn.apache.org/r1465453
Log:
DERBY-129 tests Derby should throw a truncation error or warning when CASTing a parameter/constant to char or char for bit datatypes and the data is too large for the datatype. Release Note covered by DERBY-5749.
merge tests from revision 1341046


Modified:
    db/derby/code/branches/10.8.3.1_testcompat/   (props changed)
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/LOB.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/Rllmodule1.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/Rllmodule2.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/Rllmodule3.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/Rllmodule4.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/RowLockIso.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/aggbuiltin.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/cast.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/dml083.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/dml149.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/heapscan.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/lockTable.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/readlocks.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/rlliso2multi.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/rlliso3multi.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/rollForwardRecovery.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/subqueryFlattening.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/triggerGeneral.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/update.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/updatelocksJDBC30.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/xaAnotherTest.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/xaOffline1.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/xaSimpleNegative.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CastingTest.java
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LockTableQuery.subsql
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/cast.sql
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/store/LockTableQuery.subsql

Propchange: db/derby/code/branches/10.8.3.1_testcompat/
------------------------------------------------------------------------------
  Merged /db/derby/code/trunk:r1341046

Modified: db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/LOB.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/LOB.out?rev=1465453&r1=1465452&r2=1465453&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/LOB.out (original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/LOB.out Sun Apr  7 20:10:23 2013
@@ -180,6 +180,7 @@ ij> insert into b values(cast(X'01020304
 1 row inserted/updated/deleted
 ij> insert into b values(cast(X'010203040506' as blob(5)));
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
 ij> -- clob/nclob
 --   ok in spite of not being cast
 insert into c values('1234');
@@ -201,6 +202,7 @@ ij> insert into c values(cast('12345' as
 1 row inserted/updated/deleted
 ij> insert into c values(cast('123456' as clob(5)));
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
 ij> insert into n values(cast('1234' as nclob(5)));
 ERROR 0A000: Feature not implemented: NCLOB.
 ij> insert into n values(cast('12345' as nclob(5)));

Modified: db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/Rllmodule1.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/Rllmodule1.out?rev=1465453&r1=1465452&r2=1465453&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/Rllmodule1.out (original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/Rllmodule1.out Sun Apr  7 20:10:23 2013
@@ -36,7 +36,7 @@ ij> --
 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,
@@ -98,9 +98,9 @@ ij> ------------------------------------
 insert into heap_only values (1);
 1 row inserted/updated/deleted
 ij> 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  |HEAP_ONLY   |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |HEAP_ONLY   |(1,7)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |HEAP_ONLY   |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |X   |HEAP_ONLY   |(1,7)     |GRANT|ACTIVE  
 ij> commit;
 ij> 

Modified: db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/Rllmodule2.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/Rllmodule2.out?rev=1465453&r1=1465452&r2=1465453&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/Rllmodule2.out (original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/Rllmodule2.out Sun Apr  7 20:10:23 2013
@@ -37,7 +37,7 @@ ij> --
 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,
@@ -99,8 +99,8 @@ ij> ------------------------------------
 insert into heap_only values (1);
 1 row inserted/updated/deleted
 ij> 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   |X   |HEAP_ONLY   |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |X   |HEAP_ONLY   |Tablelock |GRANT|ACTIVE  
 ij> commit;
 ij> 

Modified: db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/Rllmodule3.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/Rllmodule3.out?rev=1465453&r1=1465452&r2=1465453&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/Rllmodule3.out (original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/Rllmodule3.out Sun Apr  7 20:10:23 2013
@@ -36,7 +36,7 @@ ij> --
 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,
@@ -98,9 +98,9 @@ ij> ------------------------------------
 insert into heap_only values (1);
 1 row inserted/updated/deleted
 ij> 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  |HEAP_ONLY   |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |HEAP_ONLY   |(1,7)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |HEAP_ONLY   |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |X   |HEAP_ONLY   |(1,7)     |GRANT|ACTIVE  
 ij> commit;
 ij> 

Modified: db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/Rllmodule4.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/Rllmodule4.out?rev=1465453&r1=1465452&r2=1465453&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/Rllmodule4.out (original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/Rllmodule4.out Sun Apr  7 20:10:23 2013
@@ -36,7 +36,7 @@ ij> --
 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,
@@ -98,9 +98,9 @@ ij> ------------------------------------
 insert into heap_only values (1);
 1 row inserted/updated/deleted
 ij> 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  |HEAP_ONLY   |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |HEAP_ONLY   |(1,7)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |HEAP_ONLY   |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |X   |HEAP_ONLY   |(1,7)     |GRANT|ACTIVE  
 ij> commit;
 ij> 

Modified: db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/RowLockIso.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/RowLockIso.out?rev=1465453&r1=1465452&r2=1465453&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/RowLockIso.out (original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/RowLockIso.out Sun Apr  7 20:10:23 2013
@@ -64,7 +64,7 @@ ij> --
 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,
@@ -132,8 +132,8 @@ select a, b from a;
 A          |B          
 -----------------------
 ij> 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> commit;
 ij> --------------------------------------------------------------------------------
 -- Test select from one row heap table
@@ -141,18 +141,18 @@ ij> ------------------------------------
 insert into a values (1, -1, PADSTRING('one',1900));
 1 row inserted/updated/deleted
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(1,7)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |X   |A           |(1,7)     |GRANT|ACTIVE  
 ij> commit;
 ij> select a, b from a;
 A          |B          
 -----------------------
 1          |-1         
 ij> 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> commit;
 ij> --------------------------------------------------------------------------------
 -- Test select from two row heap table - this will release one row lock as it
@@ -167,8 +167,8 @@ A          |B          
 1          |-1         
 2          |-2         
 ij> 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> commit;
 ij> --------------------------------------------------------------------------------
 -- Test select from three row heap table (multiple pages) - this will release 
@@ -181,20 +181,20 @@ ij> insert into a values (4, -4, PADSTRI
 ij> insert into a values (5, -5, PADSTRING('two',1900));
 1 row inserted/updated/deleted
 ij> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-APP     |UserTran|TABLE   |3   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(2,6)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(2,7)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(3,6)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |3   |IX  |A           |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |X   |A           |(2,6)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |X   |A           |(2,7)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |X   |A           |(3,6)     |GRANT|ACTIVE  
 ij> commit;
 ij> delete from a where a.a = 3;
 1 row inserted/updated/deleted
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(2,6)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |X   |A           |(2,6)     |GRANT|ACTIVE  
 ij> commit;
 ij> select a,b from a;
 A          |B          
@@ -204,8 +204,8 @@ A          |B          
 4          |-4         
 5          |-5         
 ij> 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> commit;
 ij> --------------------------------------------------------------------------------
 -- Test full read cursor scan over all the rows in the heap, no group fetch.
@@ -225,59 +225,59 @@ ij> get cursor scan_cursor as
 ij> call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.language.bulkFetchDefault', '16');
 0 rows inserted/updated/deleted
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          
 -----------------------
 1          |-1         
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,7)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |S   |A           |(1,7)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          
 -----------------------
 2          |-2         
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,8)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |S   |A           |(1,8)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          
 -----------------------
 4          |-4         
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,7)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |S   |A           |(2,7)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          
 -----------------------
 5          |-5         
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(3,6)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |S   |A           |(3,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 No current row
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
 ij> close scan_cursor;
 ij> 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> commit;
 ij> 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> CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.language.bulkFetchDefault','16');
 0 rows inserted/updated/deleted
 ij> --------------------------------------------------------------------------------
@@ -298,51 +298,51 @@ ij> get cursor scan_cursor as
 ij> CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.language.bulkFetchDefault','16');
 0 rows inserted/updated/deleted
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          
 -----------------------
 1          |-1         
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          
 -----------------------
 2          |-2         
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          
 -----------------------
 4          |-4         
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          
 -----------------------
 5          |-5         
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
 ij> next scan_cursor;
 No current row
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
 ij> close scan_cursor;
 ij> 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> commit;
 ij> --------------------------------------------------------------------------------
 -- Test full cursor scan over all the rows in the heap, with default group fetch
@@ -350,51 +350,51 @@ ij> ------------------------------------
 get cursor scan_cursor as
     'select a, b from a';
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          
 -----------------------
 1          |-1         
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          
 -----------------------
 2          |-2         
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          
 -----------------------
 4          |-4         
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          
 -----------------------
 5          |-5         
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
 ij> next scan_cursor;
 No current row
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
 ij> close scan_cursor;
 ij> 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> commit;
 ij> --------------------------------------------------------------------------------
 -- Test full cursor for update scan over all the rows in the heap, 
@@ -403,56 +403,56 @@ ij> ------------------------------------
 get cursor scan_cursor as
     'select a, b from a for update';
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          
 -----------------------
 1          |-1         
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |A           |(1,7)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |A           |(1,7)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          
 -----------------------
 2          |-2         
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |A           |(1,8)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |A           |(1,8)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          
 -----------------------
 4          |-4         
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |A           |(2,7)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |A           |(2,7)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          
 -----------------------
 5          |-5         
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |U   |A           |(3,6)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |U   |A           |(3,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 No current row
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
 ij> close scan_cursor;
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IX  |A           |Tablelock |GRANT|ACTIVE  
 ij> commit;
 ij> --------------------------------------------------------------------------------
 -- Test full read cursor scan on a join over all the rows in the btree, 
@@ -485,8 +485,8 @@ select a, b from a;
 A          |B          
 -----------------------
 ij> 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> commit;
 ij> --------------------------------------------------------------------------------
 -- Test select from one row index'd table
@@ -494,18 +494,18 @@ ij> ------------------------------------
 insert into a values (5, -5, PADSTRING('five',1900), 5, PADSTRING('negative five',2000));
 1 row inserted/updated/deleted
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(1,7)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |X   |A           |(1,7)     |GRANT|ACTIVE  
 ij> commit;
 ij> select a, b from a;
 A          |B          
 -----------------------
 5          |-5         
 ij> 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> commit;
 ij> --------------------------------------------------------------------------------
 -- Test select from two row indexed heap table - this will release one row
@@ -520,8 +520,8 @@ A          |B          
 4          |-4         
 5          |-5         
 ij> 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> commit;
 ij> --------------------------------------------------------------------------------
 -- Test select from three row indexed heap table (multiple pages) - this will
@@ -534,20 +534,20 @@ ij> insert into a values (2, -2, PADSTRI
 ij> insert into a values (1, -1, PADSTRING('one',1900),   1, PADSTRING('negtive one',2000));
 1 row inserted/updated/deleted
 ij> select * from lock_table order by tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-APP     |UserTran|TABLE   |6   |IX  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(3,6)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(4,6)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |A           |(5,6)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |6   |IX  |A           |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |X   |A           |(3,6)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |X   |A           |(4,6)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |X   |A           |(5,6)     |GRANT|ACTIVE  
 ij> commit;
 ij> delete from a where a.a = 3;
 1 row inserted/updated/deleted
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |2   |X   |A           |(3,6)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |2   |IX  |A           |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |2   |X   |A           |(3,6)     |GRANT|ACTIVE  
 ij> commit;
 ij> select a,b from a;
 A          |B          
@@ -557,8 +557,8 @@ A          |B          
 4          |-4         
 5          |-5         
 ij> 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> commit;
 ij> --------------------------------------------------------------------------------
 -- Test full read cursor scan over all the rows in the indexed heap, 
@@ -580,59 +580,59 @@ ij> get cursor scan_cursor as
 ij> CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.language.bulkFetchDefault','16');
 0 rows inserted/updated/deleted
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          
 -----------------------
 1          |-1         
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(5,6)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |S   |A           |(5,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          
 -----------------------
 2          |-2         
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(4,6)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |S   |A           |(4,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          
 -----------------------
 4          |-4         
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(2,6)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |S   |A           |(2,6)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          
 -----------------------
 5          |-5         
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |A           |(1,7)     |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |S   |A           |(1,7)     |GRANT|ACTIVE  
 ij> next scan_cursor;
 No current row
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
 ij> close scan_cursor;
 ij> 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> commit;
 ij> 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> --------------------------------------------------------------------------------
 -- Test full cursor scan over all the rows in the index , 2 row group fetch.
 --------------------------------------------------------------------------------
@@ -651,51 +651,51 @@ ij> get cursor scan_cursor as
 ij> CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.language.bulkFetchDefault','16');
 0 rows inserted/updated/deleted
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          
 -----------------------
 1          |-1         
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          
 -----------------------
 2          |-2         
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          
 -----------------------
 4          |-4         
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          
 -----------------------
 5          |-5         
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
 ij> next scan_cursor;
 No current row
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
 ij> close scan_cursor;
 ij> 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> commit;
 ij> --------------------------------------------------------------------------------
 -- Test full cursor scan over all the rows in the index, with default group
@@ -712,51 +712,51 @@ ij> commit;
 ij> get cursor scan_cursor as
     'select a, b from a';
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          
 -----------------------
 1          |-1         
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          
 -----------------------
 2          |-2         
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          
 -----------------------
 4          |-4         
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
 ij> next scan_cursor;
 A          |B          
 -----------------------
 5          |-5         
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
 ij> next scan_cursor;
 No current row
 ij> 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  |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |A           |Tablelock |GRANT|ACTIVE  
 ij> close scan_cursor;
 ij> 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> commit;
 ij> --------------------------------------------------------------------------------
 -- Test getting index lock on a drop index - track 1634
@@ -774,10 +774,11 @@ ij> commit;
 ij> drop index a2;
 0 rows inserted/updated/deleted
 ij> 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   |X   |*** TRANSIEN|Tablelock |GRANT|ACTIVE  
-APP     |UserTran|TABLE   |3   |X   |A           |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |X   |*** TRANSIEN|Tablelock |GRANT|ACTIVE  
+WARNING 01004: Data truncation
+APP     |UserTransaction|TABLE   |3   |X   |A           |Tablelock |GRANT|ACTIVE  
 ij> commit;
 ij> drop table a;
 0 rows inserted/updated/deleted

Modified: db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/aggbuiltin.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/aggbuiltin.out?rev=1465453&r1=1465452&r2=1465453&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/aggbuiltin.out (original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/aggbuiltin.out Sun Apr  7 20:10:23 2013
@@ -391,12 +391,14 @@ create table tmp (x int, y smallint);
 0 rows inserted/updated/deleted
 ij> insert into tmp (x, y) select avg(i), avg(s) from t;
 1 row inserted/updated/deleted
+WARNING 01003: Null values were eliminated from the argument of a column function.
 ij> select * from tmp;
 X          |Y     
 ------------------
 0          |107   
 ij> insert into tmp (x, y) select avg(i), avg(s) from t group by b;
 3 rows inserted/updated/deleted
+WARNING 01003: Null values were eliminated from the argument of a column function.
 ij> select * from tmp;
 X          |Y     
 ------------------
@@ -1077,12 +1079,14 @@ create table tmp (x int, y smallint);
 0 rows inserted/updated/deleted
 ij> insert into tmp (x, y) select count(i), count(c) from t;
 1 row inserted/updated/deleted
+WARNING 01003: Null values were eliminated from the argument of a column function.
 ij> select * from tmp;
 X          |Y     
 ------------------
 15         |15    
 ij> insert into tmp (x, y) select count(i), count(c) from t group by b;
 3 rows inserted/updated/deleted
+WARNING 01003: Null values were eliminated from the argument of a column function.
 ij> select * from tmp;
 X          |Y     
 ------------------
@@ -1684,12 +1688,14 @@ create table tmp (x int, y smallint);
 0 rows inserted/updated/deleted
 ij> insert into tmp (x, y) select sum(i), sum(s) from t;
 1 row inserted/updated/deleted
+WARNING 01003: Null values were eliminated from the argument of a column function.
 ij> select * from tmp;
 X          |Y     
 ------------------
 1          |1600  
 ij> insert into tmp (x, y) select sum(i), sum(s) from t group by b;
 3 rows inserted/updated/deleted
+WARNING 01003: Null values were eliminated from the argument of a column function.
 ij> select * from tmp;
 X          |Y     
 ------------------
@@ -2247,12 +2253,14 @@ create table tmp (x int, y char(20));
 0 rows inserted/updated/deleted
 ij> insert into tmp (x, y) select max(i), max(c) from t;
 1 row inserted/updated/deleted
+WARNING 01003: Null values were eliminated from the argument of a column function.
 ij> select * from tmp;
 X          |Y                   
 --------------------------------
 1          |goodbye             
 ij> insert into tmp (x, y) select max(i), max(c) from t group by b;
 3 rows inserted/updated/deleted
+WARNING 01003: Null values were eliminated from the argument of a column function.
 ij> select * from tmp;
 X          |Y                   
 --------------------------------
@@ -2778,12 +2786,14 @@ create table tmp (x int, y char(20));
 0 rows inserted/updated/deleted
 ij> insert into tmp (x, y) select min(i), min(c) from t;
 1 row inserted/updated/deleted
+WARNING 01003: Null values were eliminated from the argument of a column function.
 ij> select * from tmp;
 X          |Y                   
 --------------------------------
 0          |duplicate           
 ij> insert into tmp (x, y) select min(i), min(c) from t group by b;
 3 rows inserted/updated/deleted
+WARNING 01003: Null values were eliminated from the argument of a column function.
 ij> select * from tmp;
 X          |Y                   
 --------------------------------

Modified: db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/cast.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/cast.out?rev=1465453&r1=1465452&r2=1465453&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/cast.out (original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/cast.out Sun Apr  7 20:10:23 2013
@@ -25,18 +25,19 @@ ij> --
 
 -- shrink/grow bit and char
 -- no exceptions should be raised.
--- once we have warnings we'll expect
--- a warning when shrinking non space/zeros
+-- expect a warning when shrinking non-space
 
 -- shrink
 values (cast ('hell' as char(2)));
 1 
 --
 he
+WARNING 01004: Data truncation
 ij> values (cast ('hell' as varchar(2)));
 1 
 --
 he
+WARNING 01004: Data truncation
 ij> -- shrink, whitespace only
 values (cast ('he  ' as char(2)));
 1 
@@ -67,11 +68,13 @@ values (cast (X'1111' as char(1) for bit
 1 
 --
 11
+WARNING 01004: Data truncation
 ij> -- shrink, zero only
 values (cast (X'1100' as char(1) for bit data));
 1 
 --
 11
+WARNING 01004: Data truncation
 ij> -- expand
 values (cast (X'1111' as char(2) for bit data));
 1   
@@ -87,150 +90,187 @@ values cast (X'11111111' as char(1) for 
 1 
 --
 11
+WARNING 01004: Data truncation
 ij> values cast (X'01111111' as char(1) for bit data);
 1 
 --
 01
+WARNING 01004: Data truncation
 ij> values cast (X'11111111' as char(1) for bit data);
 1 
 --
 11
+WARNING 01004: Data truncation
 ij> values cast (X'01111111' as char(1) for bit data);
 1 
 --
 01
+WARNING 01004: Data truncation
 ij> values cast (X'00111111' as char(1) for bit data);
 1 
 --
 00
+WARNING 01004: Data truncation
 ij> values cast (X'11111111' as char(1) for bit data);
 1 
 --
 11
+WARNING 01004: Data truncation
 ij> values cast (X'01111111' as char(1) for bit data);
 1 
 --
 01
+WARNING 01004: Data truncation
 ij> values cast (X'00111111' as char(1) for bit data);
 1 
 --
 00
+WARNING 01004: Data truncation
 ij> values cast (X'00011111' as char(1) for bit data);
 1 
 --
 00
+WARNING 01004: Data truncation
 ij> values cast (X'11111111' as char(1) for bit data);
 1 
 --
 11
+WARNING 01004: Data truncation
 ij> values cast (X'01111111' as char(1) for bit data);
 1 
 --
 01
+WARNING 01004: Data truncation
 ij> values cast (X'00111111' as char(1) for bit data);
 1 
 --
 00
+WARNING 01004: Data truncation
 ij> values cast (X'00011111' as char(1) for bit data);
 1 
 --
 00
+WARNING 01004: Data truncation
 ij> values cast (X'00001111' as char(1) for bit data);
 1 
 --
 00
+WARNING 01004: Data truncation
 ij> values cast (X'11111111' as char(1) for bit data);
 1 
 --
 11
+WARNING 01004: Data truncation
 ij> values cast (X'01111111' as char(1) for bit data);
 1 
 --
 01
+WARNING 01004: Data truncation
 ij> values cast (X'00111111' as char(1) for bit data);
 1 
 --
 00
+WARNING 01004: Data truncation
 ij> values cast (X'00011111' as char(1) for bit data);
 1 
 --
 00
+WARNING 01004: Data truncation
 ij> values cast (X'00001111' as char(1) for bit data);
 1 
 --
 00
+WARNING 01004: Data truncation
 ij> values cast (X'00000111' as char(1) for bit data);
 1 
 --
 00
+WARNING 01004: Data truncation
 ij> values cast (X'11111111' as char(1) for bit data);
 1 
 --
 11
+WARNING 01004: Data truncation
 ij> values cast (X'01111111' as char(1) for bit data);
 1 
 --
 01
+WARNING 01004: Data truncation
 ij> values cast (X'00111111' as char(1) for bit data);
 1 
 --
 00
+WARNING 01004: Data truncation
 ij> values cast (X'00011111' as char(1) for bit data);
 1 
 --
 00
+WARNING 01004: Data truncation
 ij> values cast (X'00001111' as char(1) for bit data);
 1 
 --
 00
+WARNING 01004: Data truncation
 ij> values cast (X'00000111' as char(1) for bit data);
 1 
 --
 00
+WARNING 01004: Data truncation
 ij> values cast (X'00000011' as char(1) for bit data);
 1 
 --
 00
+WARNING 01004: Data truncation
 ij> values cast (X'11111111' as char(1) for bit data);
 1 
 --
 11
+WARNING 01004: Data truncation
 ij> values cast (X'01111111' as char(1) for bit data);
 1 
 --
 01
+WARNING 01004: Data truncation
 ij> values cast (X'00111111' as char(1) for bit data);
 1 
 --
 00
+WARNING 01004: Data truncation
 ij> values cast (X'00011111' as char(1) for bit data);
 1 
 --
 00
+WARNING 01004: Data truncation
 ij> values cast (X'00001111' as char(1) for bit data);
 1 
 --
 00
+WARNING 01004: Data truncation
 ij> values cast (X'00000111' as char(1) for bit data);
 1 
 --
 00
+WARNING 01004: Data truncation
 ij> values cast (X'00000011' as char(1) for bit data);
 1 
 --
 00
+WARNING 01004: Data truncation
 ij> values cast (X'00000001' as char(1) for bit data);
 1 
 --
 00
+WARNING 01004: Data truncation
 ij> values cast (X'0011111111111111' as char(1) for bit data);
 1 
 --
 00
+WARNING 01004: Data truncation
 ij> values cast (X'1111111100111111' as char(2) for bit data);
 1   
 ----
 1111
+WARNING 01004: Data truncation
 ij> ---------
 --numbers
 ---------
@@ -1369,8 +1409,10 @@ create table x(c1 char(1));
 ij> prepare param1 as 'insert into x values cast(? as char(1))';
 ij> insert into x values cast('12' as char(1));
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
 ij> execute param1 using 'values ''34''';
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
 ij> select * from x;
 C1  
 ----
@@ -1382,6 +1424,7 @@ ij> insert into x values cast(12 as char
 ERROR 22001: A truncation error was encountered trying to shrink CHAR '12' to length 1.
 ij> execute param1 using 'values 34';
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
 ij> select * from x;
 C1  
 ----
@@ -1392,6 +1435,7 @@ ij> insert into x values cast(time('12:1
 ERROR 22001: A truncation error was encountered trying to shrink CHAR '12:12:12' to length 1.
 ij> execute param1 using 'values time(''21:12:12'')';
 1 row inserted/updated/deleted
+WARNING 01004: Data truncation
 ij> select * from x;
 C1  
 ----
@@ -1513,6 +1557,7 @@ ij> values (char('abcde', 4));
 1   
 ----
 abcd
+WARNING 01004: Data truncation
 ij> values (varchar('', 20));
 1                   
 --------------------

Modified: db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/dml083.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/dml083.out?rev=1465453&r1=1465452&r2=1465453&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/dml083.out (original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/dml083.out Sun Apr  7 20:10:23 2013
@@ -115,6 +115,7 @@ ij> -- PASS:0500 If WARNING, null value 
          SELECT MAX(GRADE) 
                FROM HU.STAFF;
 1 row inserted/updated/deleted
+WARNING 01003: Null values were eliminated from the argument of a column function.
 ij> -- PASS:0500 If WARNING, null value eliminated in set function?
 -- PASS:0500 OR SQLSTATE = 01003?
 

Modified: db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/dml149.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/dml149.out?rev=1465453&r1=1465452&r2=1465453&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/dml149.out (original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/dml149.out Sun Apr  7 20:10:23 2013
@@ -166,6 +166,7 @@ ij> -- PASS:0846 If 1 row selected and O
 1    
 -----
 -12.0
+WARNING 01004: Data truncation
 ij> -- PASS:0846 If ERROR, string data, right truncation, 0 rows selected?
 
    UPDATE NO_DUCK

Modified: db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/heapscan.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/heapscan.out?rev=1465453&r1=1465452&r2=1465453&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/heapscan.out (original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/heapscan.out Sun Apr  7 20:10:23 2013
@@ -69,7 +69,7 @@ ij(SCANNER)> --
 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,
@@ -173,10 +173,11 @@ KEYCOL     
 -----------
 0          
 ij(SCANNER)> 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  |DATA        |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|TABLE   |1   |X   |JUST_TO_BLOC|Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |DATA        |Tablelock |GRANT|ACTIVE  
+WARNING 01004: Data truncation
+APP     |UserTransaction|TABLE   |1   |X   |JUST_TO_BLOC|Tablelock |GRANT|ACTIVE  
 ij(SCANNER)> -- now delete all rows but the last one, space should be reclaimed before
 -- the scanner gets a chance to run.
 set connection deleter;
@@ -193,19 +194,20 @@ ij(DELETER)> commit;
 ij(DELETER)> delete from data where keycol < 80;
 8 rows inserted/updated/deleted
 ij(DELETER)> 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  |DATA        |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|TABLE   |2   |IX  |DATA        |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |DATA        |(1,7)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |DATA        |(2,6)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |DATA        |(3,6)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |DATA        |(4,6)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |DATA        |(5,6)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |DATA        |(6,6)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |DATA        |(7,6)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |X   |DATA        |(8,6)     |GRANT|ACTIVE  
-APP     |UserTran|TABLE   |1   |X   |JUST_TO_BLOC|Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+APP     |UserTransaction|TABLE   |1   |IS  |DATA        |Tablelock |GRANT|ACTIVE  
+WARNING 01004: Data truncation
+APP     |UserTransaction|TABLE   |2   |IX  |DATA        |Tablelock |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |X   |DATA        |(1,7)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |X   |DATA        |(2,6)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |X   |DATA        |(3,6)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |X   |DATA        |(4,6)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |X   |DATA        |(5,6)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |X   |DATA        |(6,6)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |X   |DATA        |(7,6)     |GRANT|ACTIVE  
+APP     |UserTransaction|ROW     |1   |X   |DATA        |(8,6)     |GRANT|ACTIVE  
+APP     |UserTransaction|TABLE   |1   |X   |JUST_TO_BLOC|Tablelock |GRANT|ACTIVE  
 ij(DELETER)> commit;
 ij(DELETER)> -- give post commit a chance to run, by hanging on a lock.
 drop table just_to_block_on;

Modified: db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/lockTable.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/lockTable.out?rev=1465453&r1=1465452&r2=1465453&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/lockTable.out (original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/lockTable.out Sun Apr  7 20:10:23 2013
@@ -55,7 +55,7 @@ ij(C1)> --
 --
 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,
@@ -68,9 +68,9 @@ from 
 on l.xid = t.xid where l.tableType <> 'S' 
 order by 
     tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-U1      |UserTran|TABLE   |1   |X   |T1          |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+U1      |UserTransaction|TABLE   |1   |X   |T1          |Tablelock |GRANT|ACTIVE  
 ij(C1)> -- verify that we can insert into the table
 insert into t1 values 2;
 1 row inserted/updated/deleted
@@ -108,7 +108,7 @@ ij(C1)> --
 --
 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,
@@ -121,9 +121,9 @@ from 
 on l.xid = t.xid where l.tableType <> 'S' 
 order by 
     tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-U1      |UserTran|TABLE   |1   |X   |T1          |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+U1      |UserTransaction|TABLE   |1   |X   |T1          |Tablelock |GRANT|ACTIVE  
 ij(C1)> -- verify that we can insert into the table
 insert into t1 values 3;
 1 row inserted/updated/deleted
@@ -162,7 +162,7 @@ ij(C1)> --
 --
 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,
@@ -175,9 +175,9 @@ from 
 on l.xid = t.xid where l.tableType <> 'S' 
 order by 
     tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-U1      |UserTran|TABLE   |1   |S   |T1          |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+U1      |UserTransaction|TABLE   |1   |S   |T1          |Tablelock |GRANT|ACTIVE  
 ij(C1)> -- verify that we can insert into the table
 insert into t1 values 4;
 1 row inserted/updated/deleted
@@ -216,7 +216,7 @@ ij(C1)> --
 --
 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,
@@ -229,10 +229,10 @@ from 
 on l.xid = t.xid where l.tableType <> 'S' 
 order by 
     tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-U2      |UserTran|TABLE   |1   |S   |T1          |Tablelock |GRANT|ACTIVE  
-U1      |UserTran|TABLE   |1   |S   |T1          |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+U2      |UserTransaction|TABLE   |1   |S   |T1          |Tablelock |GRANT|ACTIVE  
+U1      |UserTransaction|TABLE   |1   |S   |T1          |Tablelock |GRANT|ACTIVE  
 ij(C1)> -- verify that we cannot insert into the table
 insert into t1 values 5;
 ERROR 40XL1: A lock could not be obtained within the time requested
@@ -281,7 +281,7 @@ ij(C1)> --
 --
 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,
@@ -294,10 +294,10 @@ from 
 on l.xid = t.xid where l.tableType <> 'S' 
 order by 
     tabname, type desc, mode, cnt, lockname;
-USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
----------------------------------------------------------------------------
-U1      |UserTran|TABLE   |1   |S   |T1          |Tablelock |GRANT|ACTIVE  
-U2      |UserTran|TABLE   |1   |S   |T2          |Tablelock |GRANT|ACTIVE  
+USERNAME|TRANTYPE       |TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
+----------------------------------------------------------------------------------
+U1      |UserTransaction|TABLE   |1   |S   |T1          |Tablelock |GRANT|ACTIVE  
+U2      |UserTransaction|TABLE   |1   |S   |T2          |Tablelock |GRANT|ACTIVE  
 ij(C1)> commit;
 ij(C1)> disconnect;
 ij> set connection C2;



Mime
View raw message