db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r391384 [6/6] - in /db/derby/code/trunk/java: engine/org/apache/derby/impl/jdbc/ testing/org/apache/derbyTesting/functionTests/harness/ testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk16/ testing/org/apache/derbyTesting/fun...
Date Tue, 04 Apr 2006 18:47:38 GMT
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/Stream.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/Stream.out?rev=391384&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/Stream.out (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/Stream.out Tue Apr  4 11:47:34 2006
@@ -0,0 +1,24 @@
+get stream from SMALL_BLOB_TABLE.SMALL_BLOB ...
+get stream from SMALL_BLOB_TABLE.SMALL_BLOB again ...
+Expected exception may happen.
+SQL Exception: Stream of column value in result cannot be retrieved twice
+Caused by: org.apache.derby.client.am.SqlException: Stream of column value in result cannot be retrieved twice
+	... 4 more
+get stream from LARGE_BLOB_TABLE.LARGE_BLOB ...
+get stream from LARGE_BLOB_TABLE.LARGE_BLOB again ...
+Expected exception may happen.
+SQL Exception: Stream of column value in result cannot be retrieved twice
+Caused by: org.apache.derby.client.am.SqlException: Stream of column value in result cannot be retrieved twice
+	... 4 more
+get reader from SMALL_CLOB_TABLE.SMALL_CLOB ...
+get reader from SMALL_CLOB_TABLE.SMALL_CLOBagain ...
+Expected exception may happen.
+SQL Exception: Stream of column value in result cannot be retrieved twice
+Caused by: org.apache.derby.client.am.SqlException: Stream of column value in result cannot be retrieved twice
+	... 4 more
+get reader from LARGE_CLOB_TABLE.LARGE_CLOB ...
+get reader from LARGE_CLOB_TABLE.LARGE_CLOBagain ...
+Expected exception may happen.
+SQL Exception: Stream of column value in result cannot be retrieved twice
+Caused by: org.apache.derby.client.am.SqlException: Stream of column value in result cannot be retrieved twice
+	... 4 more

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/Stream.out
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/ieptests.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/ieptests.out?rev=391384&r1=391383&r2=391384&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/ieptests.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/ieptests.out Tue Apr  4 11:47:34 2006
@@ -291,7 +291,7 @@
 ij> --file not found error should rollback 
 call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'T1' , 'extinout/nofile.del' , 
                                  null, null, null, 0) ;
-ERROR 38000: The exception 'java.sql.SQLException: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.' was thrown while evaluating an expression.::SQLSTATE: 38000The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.::SQLSTATE: XJ001Java exception: ': java.lang.reflect.InvocationTargetException'.::SQLSTATE: XIE04Data file not found: extinout/nofile.del : 
+ERROR 38000: The exception 'SQL Exception: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.' was thrown while evaluating an expression.::SQLSTATE: 38000The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.::SQLSTATE: XJ001Java exception: ': java.lang.reflect.InvocationTargetException'.::SQLSTATE: XIE04Data file not found: extinout/nofile.del : 
 ij> commit;
 ij> select * from t1 ;
 A          
@@ -350,7 +350,7 @@
 ij> --file not found error should rollback 
 call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'T1' , 'extinout/nofile.del' , 
                                  null, null, null, 1) ;
-ERROR 38000: The exception 'java.sql.SQLException: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.' was thrown while evaluating an expression.::SQLSTATE: 38000The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.::SQLSTATE: XJ001Java exception: ': java.lang.reflect.InvocationTargetException'.::SQLSTATE: XIE04Data file not found: extinout/nofile.del : 
+ERROR 38000: The exception 'SQL Exception: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.' was thrown while evaluating an expression.::SQLSTATE: 38000The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.::SQLSTATE: XJ001Java exception: ': java.lang.reflect.InvocationTargetException'.::SQLSTATE: XIE04Data file not found: extinout/nofile.del : 
 ij> commit;
 ij> select * from t1 ;
 A          
@@ -401,7 +401,7 @@
 ij> --file not found error should rollback 
 call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'T1', 'A' , '1'  , 'extinout/nofile.del' , 
                                  null, null, null, 0) ;
-ERROR 38000: The exception 'java.sql.SQLException: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.' was thrown while evaluating an expression.::SQLSTATE: 38000The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.::SQLSTATE: XJ001Java exception: ': java.lang.reflect.InvocationTargetException'.::SQLSTATE: XIE04Data file not found: extinout/nofile.del : 
+ERROR 38000: The exception 'SQL Exception: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.' was thrown while evaluating an expression.::SQLSTATE: 38000The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.::SQLSTATE: XJ001Java exception: ': java.lang.reflect.InvocationTargetException'.::SQLSTATE: XIE04Data file not found: extinout/nofile.del : 
 ij> commit;
 ij> select * from t1 ;
 A          
@@ -453,7 +453,7 @@
 ij> --following import will back , but should not have any impact on inserts
 call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'T1', 'A' , '1'  , 'extinout/nofile.del' , 
                                  null, null, null, 0) ;
-ERROR 38000: The exception 'java.sql.SQLException: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.' was thrown while evaluating an expression.::SQLSTATE: 38000The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.::SQLSTATE: XJ001Java exception: ': java.lang.reflect.InvocationTargetException'.::SQLSTATE: XIE04Data file not found: extinout/nofile.del : 
+ERROR 38000: The exception 'SQL Exception: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.' was thrown while evaluating an expression.::SQLSTATE: 38000The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.::SQLSTATE: XJ001Java exception: ': java.lang.reflect.InvocationTargetException'.::SQLSTATE: XIE04Data file not found: extinout/nofile.del : 
 ij> select * from t1 ;
 A          
 -----
@@ -563,7 +563,7 @@
 3 rows inserted/updated/deleted
 ij> call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'ALLTYPES' , 'extinout/alltypes.del' , 
                                  null, null, null, 1) ;
-ERROR 38000: The exception 'java.sql.SQLSyntaxErrorException: Bulk insert replace is not permitted on 'APP.ALLTYPES' because it has an enabled trigger (TRIG_IMPORT).' was thrown while evaluating an expression.::SQLSTATE: 42Z08Bulk insert replace is not permitted on 'APP.ALLTYPES' because it has an enabled trigger (TRIG_IMPORT). : 
+ERROR 38000: The exception 'SQL Exception: Bulk insert replace is not permitted on 'APP.ALLTYPES' because it has an enabled trigger (TRIG_IMPORT).' was thrown while evaluating an expression.::SQLSTATE: 42Z08Bulk insert replace is not permitted on 'APP.ALLTYPES' because it has an enabled trigger (TRIG_IMPORT). : 
 ij> select count(*) from alltypes;
 1          
 -----
@@ -606,7 +606,7 @@
 Statement executed.
 ij> --following import should fail becuase of inserting into identity column.
 CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE(NULL, 'TABLE1', 'extinout/import.del',null, null, null,1);
-ERROR 38000: The exception 'java.sql.SQLSyntaxErrorException: Attempt to modify an identity column 'C2'.' was thrown while evaluating an expression.::SQLSTATE: 42Z23Attempt to modify an identity column 'C2'.  : 
+ERROR 38000: The exception 'SQL Exception: Attempt to modify an identity column 'C2'.' was thrown while evaluating an expression.::SQLSTATE: 42Z23Attempt to modify an identity column 'C2'.  : 
 ij> --following import should be succesful
 CALL SYSCS_UTIL.SYSCS_IMPORT_DATA(NULL, 'TABLE1', 'C1,C3,C4' , '1,3,4', 'extinout/import.del',null, null, null,1);
 Statement executed.
@@ -623,7 +623,7 @@
                                  null, null, null) ;
 Statement executed.
 ij> CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE(NULL, 'TABLE1', 'extinout/import.del',null, null, null,1);
-ERROR 38000: The exception 'java.sql.SQLSyntaxErrorException: Attempt to modify an identity column 'C2'.' was thrown while evaluating an expression.::SQLSTATE: 42Z23Attempt to modify an identity column 'C2'.  : 
+ERROR 38000: The exception 'SQL Exception: Attempt to modify an identity column 'C2'.' was thrown while evaluating an expression.::SQLSTATE: 42Z23Attempt to modify an identity column 'C2'.  : 
 ij> select * from table1;
 C1 |C2 |C3 |C4  
 -----
@@ -645,7 +645,7 @@
 Statement executed.
 ij> --replace should fail because of dependent table
 CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE(NULL, 'PARENT', 'extinout/parent.del',null, null, null,1);
-ERROR 38000: The exception 'java.sql.SQLIntegrityConstraintViolationException: INSERT on table 'PARENT' caused a violation of foreign key constraint 'xxxxGENERATED-IDxxxx' for key (3).  The statement has been rolled back.' was thrown while evaluating an expression.::SQLSTATE: 23503INSERT on table 'PARENT' caused a violation of foreign key constraint 'xxxxGENERATED-IDxxxx' for key (3).  The statement has been rolled back. : 
+ERROR 38000: The exception 'SQL Exception: INSERT on table 'PARENT' caused a violation of foreign key constraint 'xxxxGENERATED-IDxxxx' for key (3).  The statement has been rolled back.' was thrown while evaluating an expression.::SQLSTATE: 23503INSERT on table 'PARENT' caused a violation of foreign key constraint 'xxxxGENERATED-IDxxxx' for key (3).  The statement has been rolled back. : 
 ij> select * from parent;
 A          
 -----
@@ -726,7 +726,7 @@
 ij> create table dest_by_default(i int generated by default as identity);
 0 rows inserted/updated/deleted
 ij> CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE('APP','DEST_ALWAYS','extinout/autoinc.dat',null,null,null,0);
-ERROR 38000: The exception 'java.sql.SQLSyntaxErrorException: Attempt to modify an identity column 'I'.' was thrown while evaluating an expression.::SQLSTATE: 42Z23Attempt to modify an identity column 'I'.  : 
+ERROR 38000: The exception 'SQL Exception: Attempt to modify an identity column 'I'.' was thrown while evaluating an expression.::SQLSTATE: 42Z23Attempt to modify an identity column 'I'.  : 
 ij> select * from dest_always;
 I          
 -----
@@ -747,7 +747,7 @@
 ij> create table dest_by_default(i int generated by default as identity);
 0 rows inserted/updated/deleted
 ij> CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE('APP','DEST_ALWAYS','extinout/autoinc.dat',null,null,null,1);
-ERROR 38000: The exception 'java.sql.SQLSyntaxErrorException: Attempt to modify an identity column 'I'.' was thrown while evaluating an expression.::SQLSTATE: 42Z23Attempt to modify an identity column 'I'.  : 
+ERROR 38000: The exception 'SQL Exception: Attempt to modify an identity column 'I'.' was thrown while evaluating an expression.::SQLSTATE: 42Z23Attempt to modify an identity column 'I'.  : 
 ij> select * from dest_always;
 I          
 -----
@@ -777,13 +777,13 @@
 1 row inserted/updated/deleted
 ij> --following export should fail because schema name is not matching the way it is defined using delimited quotes.
 call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('GROUP', 'Order' , 'extinout/order.dat', null, null, null) ;
-ERROR 38000: The exception 'java.sql.SQLSyntaxErrorException: Schema 'GROUP' does not exist' was thrown while evaluating an expression.::SQLSTATE: 42Y07Schema 'GROUP' does not exist : 
+ERROR 38000: The exception 'SQL Exception: Schema 'GROUP' does not exist' was thrown while evaluating an expression.::SQLSTATE: 42Y07Schema 'GROUP' does not exist : 
 ij> --following export should fail because table name is not matching the way it is defined in the quotes.
 call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('Group', 'ORDER' , 'extinout/order.dat', null, null, null) ;
-ERROR 38000: The exception 'java.sql.SQLSyntaxErrorException: Table 'Group.ORDER' does not exist.' was thrown while evaluating an expression.::SQLSTATE: 42X05Table 'Group.ORDER' does not exist. : 
+ERROR 38000: The exception 'SQL Exception: Table 'Group.ORDER' does not exist.' was thrown while evaluating an expression.::SQLSTATE: 42X05Table 'Group.ORDER' does not exist. : 
 ij> --following export should fail because of unquoted table name that is a reserved word.
 call SYSCS_UTIL.SYSCS_EXPORT_QUERY('select * from "Group".Order' , 'extinout/order.dat' ,    null , null , null ) ;
-ERROR 38000: The exception 'java.sql.SQLSyntaxErrorException: Syntax error: Encountered "Order" at line 1, column 23.' was thrown while evaluating an expression.::SQLSTATE: 42X01Syntax error: Encountered "Order" at line 1, column 23. : 
+ERROR 38000: The exception 'SQL Exception: Syntax error: Encountered "Order" at line 1, column 23.' was thrown while evaluating an expression.::SQLSTATE: 42X01Syntax error: Encountered "Order" at line 1, column 23. : 
 ij> --following exports should pass.
 call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('Group', 'Order' , 'extinout/order.dat', null, null, null) ;
 Statement executed.
@@ -860,10 +860,10 @@
 1 row inserted/updated/deleted
 ij> --following export should fail because schema name is not in upper case.
 call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('inventory', 'ORDERTABLE' , 'extinout/order.dat', null, null, null) ;
-ERROR 38000: The exception 'java.sql.SQLSyntaxErrorException: Schema 'inventory' does not exist' was thrown while evaluating an expression.::SQLSTATE: 42Y07Schema 'inventory' does not exist : 
+ERROR 38000: The exception 'SQL Exception: Schema 'inventory' does not exist' was thrown while evaluating an expression.::SQLSTATE: 42Y07Schema 'inventory' does not exist : 
 ij> --following export should fail because table name is not in upper case.
 call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('INVENTORY', 'ordertable' , 'extinout/order.dat', null, null, null) ;
-ERROR 38000: The exception 'java.sql.SQLSyntaxErrorException: Table 'INVENTORY.ordertable' does not exist.' was thrown while evaluating an expression.::SQLSTATE: 42X05Table 'INVENTORY.ordertable' does not exist. : 
+ERROR 38000: The exception 'SQL Exception: Table 'INVENTORY.ordertable' does not exist.' was thrown while evaluating an expression.::SQLSTATE: 42X05Table 'INVENTORY.ordertable' does not exist. : 
 ij> --following export should pass.
 call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('INVENTORY', 'ORDERTABLE' , 'extinout/order.dat', null, null, null) ;
 Statement executed.

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/importExport.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/importExport.out?rev=391384&r1=391383&r2=391384&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/importExport.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/importExport.out Tue Apr  4 11:47:34 2006
@@ -1,8 +1,8 @@
 Test importExport starting
 testing non-existing data file
-The exception 'java.sql.SQLException: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.' was thrown while evaluating an expression.::SQLSTATE: 38000The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.::SQLSTATE: XJ001Java exception: ': java.lang.reflect.InvocationTargetException'.::SQLSTATE: XIE04Data file not found: extinout/Z.dat : 
+The exception 'SQL Exception: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.' was thrown while evaluating an expression.::SQLSTATE: 38000The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.::SQLSTATE: XJ001Java exception: ': java.lang.reflect.InvocationTargetException'.::SQLSTATE: XIE04Data file not found: extinout/Z.dat : 
 testing null data file
-The exception 'java.sql.SQLException: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.' was thrown while evaluating an expression.::SQLSTATE: 38000The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.::SQLSTATE: XJ001Java exception: ': java.lang.reflect.InvocationTargetException'.::SQLSTATE: XIE05Data file cannot be null.  : 
+The exception 'SQL Exception: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.' was thrown while evaluating an expression.::SQLSTATE: 38000The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.::SQLSTATE: XJ001Java exception: ': java.lang.reflect.InvocationTargetException'.::SQLSTATE: XIE05Data file cannot be null.  : 
 testing empty table
 testing empty table with Delimited format
 testing empty table import Field/Char Delimiters
@@ -17,7 +17,7 @@
 testing datatypes that does not have Export Supprt
 Column 'C1' in the table is of type BLOB, it is not supported by the import/export feature.    : 
 Column 'C1' in the table is of type BLOB, it is not supported by the import/export feature.    : 
-The exception 'java.sql.SQLException: Read endOfFile at unexpected place on line 2.' was thrown while evaluating an expression.::SQLSTATE: XIE0ERead endOfFile at unexpected place on line 2. : 
+The exception 'SQL Exception: Read endOfFile at unexpected place on line 2.' was thrown while evaluating an expression.::SQLSTATE: XIE0ERead endOfFile at unexpected place on line 2. : 
 PASS: finished testing import and export
 PASS: teardown complete
 PASS: finished cleaning up the temporary objects from database

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/metadata.out?rev=391384&r1=391383&r2=391384&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/metadata.out Tue Apr  4 11:47:34 2006
@@ -179,6 +179,29 @@
 othersUpdatesAreVisible(ResultSet.TYPE_SCROLL_SENSITIVE)? false
 othersDeletesAreVisible(ResultSet.TYPE_SCROLL_SENSITIVE)? false
 othersInsertsAreVisible(ResultSet.TYPE_SCROLL_SENSITIVE)? false
+Test the metadata calls related to visibility of *own* changes for different resultset types
+ownUpdatesAreVisible(ResultSet.TYPE_FORWARD_ONLY)? false
+ownDeletesAreVisible(ResultSet.TYPE_FORWARD_ONLY)? false
+ownInsertsAreVisible(ResultSet.TYPE_FORWARD_ONLY)? false
+Scroll insensitive ResultSet see updates and deletes, but not inserts
+ownUpdatesAreVisible(ResultSet.TYPE_SCROLL_INSENSITIVE)? false
+ownDeletesAreVisible(ResultSet.TYPE_SCROLL_INSENSITIVE)? false
+ownInsertsAreVisible(ResultSet.TYPE_SCROLL_INSENSITIVE)? false
+Derby does not yet implement scroll sensitive resultsets and hence following metadata calls return false
+ownUpdatesAreVisible(ResultSet.TYPE_SCROLL_SENSITIVE)? false
+ownDeletesAreVisible(ResultSet.TYPE_SCROLL_SENSITIVE)? false
+ownInsertsAreVisible(ResultSet.TYPE_SCROLL_SENSITIVE)? false
+Test the metadata calls related to detectability of visible changes for different resultset types
+Expect true for updates and deletes of TYPE_SCROLL_INSENSITIVE, all others should be false
+updatesAreDetected(ResultSet.TYPE_FORWARD_ONLY)? false
+deletesAreDetected(ResultSet.TYPE_FORWARD_ONLY)? false
+insertsAreDetected(ResultSet.TYPE_FORWARD_ONLY)? false
+updatesAreDetected(ResultSet.TYPE_SCROLL_INSENSITIVE)? false
+deletesAreDetected(ResultSet.TYPE_SCROLL_INSENSITIVE)? false
+insertsAreDetected(ResultSet.TYPE_SCROLL_INSENSITIVE)? false
+updatesAreDetected(ResultSet.TYPE_SCROLL_SENSITIVE)? false
+deletesAreDetected(ResultSet.TYPE_SCROLL_SENSITIVE)? false
+insertsAreDetected(ResultSet.TYPE_SCROLL_SENSITIVE)? false
 SupportsResultSetConcurrency: TYPE_FORWARD_ONLY,CONCUR_READ_ONLY: true
 SupportsResultSetConcurrency: TYPE_FORWARD_ONLY,CONCUR_UPDATABLE: true
 SupportsResultSetConcurrency: TYPE_SCROLL_INSENSITIVE,CONCUR_READ_ONLY: true

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/odbc_metadata.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/odbc_metadata.out?rev=391384&r1=391383&r2=391384&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/odbc_metadata.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/odbc_metadata.out Tue Apr  4 11:47:34 2006
@@ -209,6 +209,29 @@
 othersUpdatesAreVisible(ResultSet.TYPE_SCROLL_SENSITIVE)? false
 othersDeletesAreVisible(ResultSet.TYPE_SCROLL_SENSITIVE)? false
 othersInsertsAreVisible(ResultSet.TYPE_SCROLL_SENSITIVE)? false
+Test the metadata calls related to visibility of *own* changes for different resultset types
+ownUpdatesAreVisible(ResultSet.TYPE_FORWARD_ONLY)? false
+ownDeletesAreVisible(ResultSet.TYPE_FORWARD_ONLY)? false
+ownInsertsAreVisible(ResultSet.TYPE_FORWARD_ONLY)? false
+Scroll insensitive ResultSet see updates and deletes, but not inserts
+ownUpdatesAreVisible(ResultSet.TYPE_SCROLL_INSENSITIVE)? false
+ownDeletesAreVisible(ResultSet.TYPE_SCROLL_INSENSITIVE)? false
+ownInsertsAreVisible(ResultSet.TYPE_SCROLL_INSENSITIVE)? false
+Derby does not yet implement scroll sensitive resultsets and hence following metadata calls return false
+ownUpdatesAreVisible(ResultSet.TYPE_SCROLL_SENSITIVE)? false
+ownDeletesAreVisible(ResultSet.TYPE_SCROLL_SENSITIVE)? false
+ownInsertsAreVisible(ResultSet.TYPE_SCROLL_SENSITIVE)? false
+Test the metadata calls related to detectability of visible changes for different resultset types
+Expect true for updates and deletes of TYPE_SCROLL_INSENSITIVE, all others should be false
+updatesAreDetected(ResultSet.TYPE_FORWARD_ONLY)? false
+deletesAreDetected(ResultSet.TYPE_FORWARD_ONLY)? false
+insertsAreDetected(ResultSet.TYPE_FORWARD_ONLY)? false
+updatesAreDetected(ResultSet.TYPE_SCROLL_INSENSITIVE)? false
+deletesAreDetected(ResultSet.TYPE_SCROLL_INSENSITIVE)? false
+insertsAreDetected(ResultSet.TYPE_SCROLL_INSENSITIVE)? false
+updatesAreDetected(ResultSet.TYPE_SCROLL_SENSITIVE)? false
+deletesAreDetected(ResultSet.TYPE_SCROLL_SENSITIVE)? false
+insertsAreDetected(ResultSet.TYPE_SCROLL_SENSITIVE)? false
 SupportsResultSetConcurrency: TYPE_FORWARD_ONLY,CONCUR_READ_ONLY: true
 SupportsResultSetConcurrency: TYPE_FORWARD_ONLY,CONCUR_UPDATABLE: true
 SupportsResultSetConcurrency: TYPE_SCROLL_INSENSITIVE,CONCUR_READ_ONLY: true

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/parameterMapping.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/parameterMapping.out?rev=391384&r1=391383&r2=391384&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/parameterMapping.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/parameterMapping.out Tue Apr  4 11:47:34 2006
@@ -87,8 +87,8 @@
   setNull with batching support(BLOB) getShort=0 was null true
   setNull(Types.NULL) getShort=0 was null true
   setNull with batching support(Types.NULL) getShort=0 was null true
-  setNull(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
-  setNull with batching support(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
+  setNull(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
+  setNull with batching support(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
 setXXX() with all JDBC Types on SMALLINT
 For setXXX() methods that pass an object, a null and valid values are checked
   setByte() getShort=98 was null false JDBC MATCH(OK)
@@ -260,8 +260,8 @@
   setNull with batching support(BLOB) getInt=0 was null true
   setNull(Types.NULL) getInt=0 was null true
   setNull with batching support(Types.NULL) getInt=0 was null true
-  setNull(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
-  setNull with batching support(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
+  setNull(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
+  setNull with batching support(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
 setXXX() with all JDBC Types on INTEGER
 For setXXX() methods that pass an object, a null and valid values are checked
   setByte() getInt=98 was null false JDBC MATCH(OK)
@@ -433,8 +433,8 @@
   setNull with batching support(BLOB) getLong=0 was null true
   setNull(Types.NULL) getLong=0 was null true
   setNull with batching support(Types.NULL) getLong=0 was null true
-  setNull(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
-  setNull with batching support(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
+  setNull(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
+  setNull with batching support(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
 setXXX() with all JDBC Types on BIGINT
 For setXXX() methods that pass an object, a null and valid values are checked
   setByte() getLong=98 was null false JDBC MATCH(OK)
@@ -606,8 +606,8 @@
   setNull with batching support(BLOB) getFloat=0.0 was null true
   setNull(Types.NULL) getFloat=0.0 was null true
   setNull with batching support(Types.NULL) getFloat=0.0 was null true
-  setNull(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
-  setNull with batching support(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
+  setNull(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
+  setNull with batching support(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
 setXXX() with all JDBC Types on REAL
 For setXXX() methods that pass an object, a null and valid values are checked
   setByte() getFloat=98.0 was null false JDBC MATCH(OK)
@@ -780,8 +780,8 @@
   setNull with batching support(BLOB) getDouble=0.0 was null true
   setNull(Types.NULL) getDouble=0.0 was null true
   setNull with batching support(Types.NULL) getDouble=0.0 was null true
-  setNull(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
-  setNull with batching support(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
+  setNull(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
+  setNull with batching support(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
 setXXX() with all JDBC Types on FLOAT
 For setXXX() methods that pass an object, a null and valid values are checked
   setByte() getDouble=98.0 was null false JDBC MATCH(OK)
@@ -953,8 +953,8 @@
   setNull with batching support(BLOB) getDouble=0.0 was null true
   setNull(Types.NULL) getDouble=0.0 was null true
   setNull with batching support(Types.NULL) getDouble=0.0 was null true
-  setNull(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
-  setNull with batching support(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
+  setNull(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
+  setNull with batching support(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
 setXXX() with all JDBC Types on DOUBLE
 For setXXX() methods that pass an object, a null and valid values are checked
   setByte() getDouble=98.0 was null false JDBC MATCH(OK)
@@ -1126,8 +1126,8 @@
   setNull with batching support(BLOB) getBigDecimal=null was null true
   setNull(Types.NULL) getBigDecimal=null was null true
   setNull with batching support(Types.NULL) getBigDecimal=null was null true
-  setNull(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
-  setNull with batching support(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
+  setNull(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
+  setNull with batching support(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
 setXXX() with all JDBC Types on DECIMAL(10,5)
 For setXXX() methods that pass an object, a null and valid values are checked
   setByte() getBigDecimal=98.00000 was null false JDBC MATCH(OK)
@@ -1305,8 +1305,8 @@
   setNull with batching support(BLOB) getString=null was null true
   setNull(Types.NULL) getString=null was null true
   setNull with batching support(Types.NULL) getString=null was null true
-  setNull(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
-  setNull with batching support(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
+  setNull(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
+  setNull with batching support(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
 setXXX() with all JDBC Types on CHAR(60)
 For setXXX() methods that pass an object, a null and valid values are checked
   setByte() getString=98                                                           was null false JDBC MATCH(OK)
@@ -1477,8 +1477,8 @@
   setNull with batching support(BLOB) getString=null was null true
   setNull(Types.NULL) getString=null was null true
   setNull with batching support(Types.NULL) getString=null was null true
-  setNull(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
-  setNull with batching support(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
+  setNull(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
+  setNull with batching support(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
 setXXX() with all JDBC Types on VARCHAR(60)
 For setXXX() methods that pass an object, a null and valid values are checked
   setByte() getString=98 was null false JDBC MATCH(OK)
@@ -1649,8 +1649,8 @@
   setNull with batching support(BLOB) getString=null was null true
   setNull(Types.NULL) getString=null was null true
   setNull with batching support(Types.NULL) getString=null was null true
-  setNull(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
-  setNull with batching support(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
+  setNull(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
+  setNull with batching support(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
 setXXX() with all JDBC Types on LONG VARCHAR
 For setXXX() methods that pass an object, a null and valid values are checked
   setByte() getString=98 was null false JDBC MATCH(OK)
@@ -1823,8 +1823,8 @@
   setNull with batching support(BLOB) getBytes=null was null true
   setNull(Types.NULL) getBytes=null was null true
   setNull with batching support(Types.NULL) getBytes=null was null true
-  setNull(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
-  setNull with batching support(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
+  setNull(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
+  setNull with batching support(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
 setXXX() with all JDBC Types on VARCHAR(60) FOR BIT DATA
 For setXXX() methods that pass an object, a null and valid values are checked
   setByte() IC JDBC MATCH (INVALID)
@@ -1998,8 +1998,8 @@
   setNull with batching support(BLOB) getDate=null was null true
   setNull(Types.NULL) getDate=null was null true
   setNull with batching support(Types.NULL) getDate=null was null true
-  setNull(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
-  setNull with batching support(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
+  setNull(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
+  setNull with batching support(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
 setXXX() with all JDBC Types on DATE
 For setXXX() methods that pass an object, a null and valid values are checked
   setByte() IC JDBC MATCH (INVALID)
@@ -2171,8 +2171,8 @@
   setNull with batching support(BLOB) getTime=null was null true
   setNull(Types.NULL) getTime=null was null true
   setNull with batching support(Types.NULL) getTime=null was null true
-  setNull(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
-  setNull with batching support(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
+  setNull(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
+  setNull with batching support(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
 setXXX() with all JDBC Types on TIME
 For setXXX() methods that pass an object, a null and valid values are checked
   setByte() IC JDBC MATCH (INVALID)
@@ -2344,8 +2344,8 @@
   setNull with batching support(BLOB) getTimestamp=null was null true
   setNull(Types.NULL) getTimestamp=null was null true
   setNull with batching support(Types.NULL) getTimestamp=null was null true
-  setNull(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
-  setNull with batching support(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
+  setNull(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
+  setNull with batching support(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
 setXXX() with all JDBC Types on TIMESTAMP
 For setXXX() methods that pass an object, a null and valid values are checked
   setByte() IC JDBC MATCH (INVALID)
@@ -2517,8 +2517,8 @@
   setNull with batching support(BLOB) getClob=null was null true
   setNull(Types.NULL) getClob=null was null true
   setNull with batching support(Types.NULL) getClob=null was null true
-  setNull(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
-  setNull with batching support(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
+  setNull(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
+  setNull with batching support(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
 setXXX() with all JDBC Types on CLOB(1k)
 For setXXX() methods that pass an object, a null and valid values are checked
   setByte() IC JDBC MATCH (INVALID)
@@ -2689,8 +2689,8 @@
   setNull with batching support(BLOB) getBlob=null was null true
   setNull(Types.NULL) getBlob=null was null true
   setNull with batching support(Types.NULL) getBlob=null was null true
-  setNull(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
-  setNull with batching support(235350345) SQLSTATE(null): java.sql.SQLException: unrecognized sql type
+  setNull(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
+  setNull with batching support(235350345) SQLSTATE(null): SQL Exception: unrecognized sql type
 setXXX() with all JDBC Types on BLOB(1k)
 For setXXX() methods that pass an object, a null and valid values are checked
   setByte() IC JDBC MATCH (INVALID)

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/procedure.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/procedure.out?rev=391384&r1=391383&r2=391384&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/procedure.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/procedure.out Tue Apr  4 11:47:34 2006
@@ -138,7 +138,7 @@
 EXPECTED SQL Exception: (42Y03) 'IR' is not recognized as a function or procedure. : 
 No ResultSet or update count returned
 No ResultSet or update count returned
-EXPECTED SQL Exception: The exception 'java.sql.SQLIntegrityConstraintViolationException: The statement was aborted because it would have caused a duplicate key value in a unique or primary key constraint or unique index identified by 'xxxxGENERATED-IDxxxx' defined on 'T1'.' was thrown while evaluating an expression.::SQLSTATE: 23505The statement was aborted because it would have caused a duplicate key value in a unique or primary key constraint or unique index identified by 'xxxxGENERATED-IDxxxx' defined on 'T1'. : 
+EXPECTED SQL Exception: The exception 'SQL Exception: The statement was aborted because it would have caused a duplicate key value in a unique or primary key constraint or unique index identified by 'xxxxGENERATED-IDxxxx' defined on 'T1'.' was thrown while evaluating an expression.::SQLSTATE: 23505The statement was aborted because it would have caused a duplicate key value in a unique or primary key constraint or unique index identified by 'xxxxGENERATED-IDxxxx' defined on 'T1'. : 
 No ResultSet or update count returned
 No ResultSet or update count returned
 No ResultSet or update count returned
@@ -154,7 +154,7 @@
 5 |ir2            
 6 |'012345678     
 CALL IR2(2, 'no way')
-EXPECTED SQL Exception: (38000) The exception 'java.sql.SQLIntegrityConstraintViolationException: The statement was aborted because it would have caused a duplicate key value in a unique or primary key constraint or unique index identified by 'xxxxGENERATED-IDxxxx' defined on 'T1'.' was thrown while evaluating an expression.::SQLSTATE: 23505The statement was aborted because it would have caused a duplicate key value in a unique or primary key constraint or unique index identified by 'xxxxGENERATED-IDxxxx' defined on 'T1'. : 
+EXPECTED SQL Exception: (38000) The exception 'SQL Exception: The statement was aborted because it would have caused a duplicate key value in a unique or primary key constraint or unique index identified by 'xxxxGENERATED-IDxxxx' defined on 'T1'.' was thrown while evaluating an expression.::SQLSTATE: 23505The statement was aborted because it would have caused a duplicate key value in a unique or primary key constraint or unique index identified by 'xxxxGENERATED-IDxxxx' defined on 'T1'. : 
 CALL IR2(?, 'no way')
 EXPECTED SQL Exception: (07000) At least one parameter to the current statement is uninitialized.
 CALL IR2(2, ?)

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/savepointJdbc30_JSR169.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/savepointJdbc30_JSR169.out?rev=391384&r1=391383&r2=391384&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/savepointJdbc30_JSR169.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/savepointJdbc30_JSR169.out Tue Apr  4 11:47:34 2006
@@ -2,12 +2,12 @@
 Test savepointJdbc30 starting for regular connections
 Tests common to DRDA and embedded Cloudscape
 Test1 - no unnamed savepoints allowed if autocommit is true
-Expected Exception is Cannot set savepoint when in auto-commit mode.
+Expected Exception is Cannot issue savepoint when autoCommit is on.
 Test1a - no named savepoints allowed if autocommit is true
-Expected Exception is Cannot set savepoint when in auto-commit mode.
+Expected Exception is Cannot issue savepoint when autoCommit is on.
 Test2 - Release and reuse a savepoint name
 Test3 - null name not allowed for named savepoints
-Expected Exception is Named savepoint needs a none-null name.
+Expected Exception is Cannot pass null for savepoint name.
 Test4 - Verify names/ids of named/unnamed savepoints
 Expected Exception is This is an un-named savepoint.
 Expected Exception is This is a named savepoint.
@@ -20,11 +20,11 @@
 Test6b - create a savepoint, release it, create another with same name and rollback the first one
 Expected Exception is SAVEPOINT, s1 does not  exist or is not active in the current transaction. : 
 Test6c - Try to use a savepoint from another connection for release
-Expected Exception is Cannot release a savepoint that was not created by this connection.
+Expected Exception is Cannot rollback or release a savepoint that was not created by this connection.
 Test7a - swap savepoints across connections with release
-Expected Exception is Cannot release a savepoint that was not created by this connection.
+Expected Exception is Cannot rollback or release a savepoint that was not created by this connection.
 Test7b - swap savepoints across connections with rollback
-Expected Exception is Rollback to a savepoint not created by this connection.
+Expected Exception is Cannot rollback or release a savepoint that was not created by this connection.
 Test 9 test savepoint name
 Test 10 test savepoint name case sensitivity
 Test 11 rolling back a savepoint multiple times - should work
@@ -69,7 +69,7 @@
 Test 25 Should not be able to create a SQL savepoint starting with name SYS through jdbc
 Expected Exception is An object cannot be created with the schema name 'SYS'. : 
 Test 26a rollback of null savepoint
-Expected Exception is Cannot rollback to a null savepoint.
+Expected Exception is A RELEASE or ROLLBACK TO SAVEPOINT was specified, but the savepoint does not exist.
 Test 26b release  of null savepoint
-Expected Exception is Cannot release a null savepoint.
+Expected Exception is A RELEASE or ROLLBACK TO SAVEPOINT was specified, but the savepoint does not exist.
 Next try non-DRDA tests

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/savepointJdbc30_XA.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/savepointJdbc30_XA.out?rev=391384&r1=391383&r2=391384&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/savepointJdbc30_XA.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/savepointJdbc30_XA.out Tue Apr  4 11:47:34 2006
@@ -1,12 +1,12 @@
 Test savepointJdbc30 starting for connections from XADataSource (local tranasaction)
 Tests common to DRDA and embedded Cloudscape
 Test1 - no unnamed savepoints allowed if autocommit is true
-Expected Exception is Cannot set savepoint when in auto-commit mode.
+Expected Exception is Cannot issue savepoint when autoCommit is on.
 Test1a - no named savepoints allowed if autocommit is true
-Expected Exception is Cannot set savepoint when in auto-commit mode.
+Expected Exception is Cannot issue savepoint when autoCommit is on.
 Test2 - Release and reuse a savepoint name
 Test3 - null name not allowed for named savepoints
-Expected Exception is Named savepoint needs a none-null name.
+Expected Exception is Cannot pass null for savepoint name.
 Test4 - Verify names/ids of named/unnamed savepoints
 Expected Exception is This is an un-named savepoint.
 Expected Exception is This is a named savepoint.
@@ -19,11 +19,11 @@
 Test6b - create a savepoint, release it, create another with same name and rollback the first one
 Expected Exception is SAVEPOINT, s1 does not  exist or is not active in the current transaction. : 
 Test6c - Try to use a savepoint from another connection for release
-Expected Exception is Cannot release a savepoint that was not created by this connection.
+Expected Exception is Cannot rollback or release a savepoint that was not created by this connection.
 Test7a - swap savepoints across connections with release
-Expected Exception is Cannot release a savepoint that was not created by this connection.
+Expected Exception is Cannot rollback or release a savepoint that was not created by this connection.
 Test7b - swap savepoints across connections with rollback
-Expected Exception is Rollback to a savepoint not created by this connection.
+Expected Exception is Cannot rollback or release a savepoint that was not created by this connection.
 Test 9 test savepoint name
 Test 10 test savepoint name case sensitivity
 Test 11 rolling back a savepoint multiple times - should work
@@ -68,7 +68,7 @@
 Test 25 Should not be able to create a SQL savepoint starting with name SYS through jdbc
 Expected Exception is An object cannot be created with the schema name 'SYS'. : 
 Test 26a rollback of null savepoint
-Expected Exception is Cannot rollback to a null savepoint.
+Expected Exception is A RELEASE or ROLLBACK TO SAVEPOINT was specified, but the savepoint does not exist.
 Test 26b release  of null savepoint
-Expected Exception is Cannot release a null savepoint.
+Expected Exception is A RELEASE or ROLLBACK TO SAVEPOINT was specified, but the savepoint does not exist.
 Next try non-DRDA tests

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/closed.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/closed.out?rev=391384&r1=391383&r2=391384&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/closed.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/closed.out Tue Apr  4 11:47:34 2006
@@ -1,31 +1,31 @@
-Test closed starting
-Test case for Derby-62 - serialization error with SQLException
-'DROP TABLE' cannot be performed on 'APP.DERBY62_DAIN_SUNDSTROM' because it does not exist.
-ERROR XJ012: 'Statement' already closed.
-ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
-ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
-ERROR 08003: No current connection.
-ERROR 08003: No current connection.
-ERROR 08003: No current connection.
-ERROR 08003: No current connection.
-ERROR 08003: No current connection.
-ERROR 08003: No current connection.
-ERROR 08003: No current connection.
-Test database shutdown ...
-java.sql.SQLTransientConnectionException: Database 'wombat' shutdown.
-Caused by: ERROR 08006: Database 'wombat' shutdown.
-	... 10 more
-CALL sleep(10000) - 38000, 38000 -- InterruptedException, XJ001 -- InterruptedException
-LOCK TABLE CLOSED.LOCKME IN EXCLUSIVE MODE - 08006, 08006 -- Database 'wombat' shutdown.
-ERROR 08006: Database 'wombat' shutdown.
-Shutdown test completed.
-Test system shutdown ...
-java.sql.SQLTransientConnectionException: Database 'wombat' shutdown.
-Caused by: ERROR 08006: Database 'wombat' shutdown.
-	... 10 more
-CALL sleep(10000) - 38000, 38000 -- InterruptedException, XJ001 -- InterruptedException
-LOCK TABLE CLOSED.LOCKME IN EXCLUSIVE MODE - 08006, 08006 -- Database 'wombat' shutdown.
-ERROR XJ015: Derby system shutdown.
-Shutdown test completed.
-PASS
-Test closed finished
+Test closed starting
+Test case for Derby-62 - serialization error with SQLException
+'DROP TABLE' cannot be performed on 'APP.DERBY62_DAIN_SUNDSTROM' because it does not exist.
+ERROR XJ012: 'Statement' already closed.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
+ERROR 08003: No current connection.
+ERROR 08003: No current connection.
+ERROR 08003: No current connection.
+ERROR 08003: No current connection.
+ERROR 08003: No current connection.
+ERROR 08003: No current connection.
+ERROR 08003: No current connection.
+Test database shutdown ...
+SQL Exception: Database 'wombat' shutdown.
+Caused by: ERROR 08006: Database 'wombat' shutdown.
+	... 10 more
+CALL sleep(10000) - 38000, 38000 -- InterruptedException, XJ001 -- InterruptedException
+LOCK TABLE CLOSED.LOCKME IN EXCLUSIVE MODE - 08006, 08006 -- Database 'wombat' shutdown.
+ERROR 08006: Database 'wombat' shutdown.
+Shutdown test completed.
+Test system shutdown ...
+SQL Exception: Database 'wombat' shutdown.
+Caused by: ERROR 08006: Database 'wombat' shutdown.
+	... 10 more
+CALL sleep(10000) - 38000, 38000 -- InterruptedException, XJ001 -- InterruptedException
+LOCK TABLE CLOSED.LOCKME IN EXCLUSIVE MODE - 08006, 08006 -- Database 'wombat' shutdown.
+ERROR XJ015: Derby system shutdown.
+Shutdown test completed.
+PASS
+Test closed finished

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/releaseCompileLocks.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/releaseCompileLocks.out?rev=391384&r1=391383&r2=391384&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/releaseCompileLocks.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/releaseCompileLocks.out Tue Apr  4 11:47:34 2006
@@ -1,213 +1,213 @@
-ij> autocommit off;
-ij> -- move static initializer tests to front, hoping to avoid class garbage
--- collection in jdk18.  Sometimes the static initializer in the 
--- DMLInStaticInitializer and InsertInStaticInitializer classes gets called
--- twice in jdk118 - causing a diff.  This can happen if for some reason the
--- JVM decides to garbage collect the class between references to the class
--- in the course of executing the query.
--- static initializers.
-create table t1 (s int);
-0 rows inserted/updated/deleted
-ij> commit;
-ij> create function dmlstatic() returns INT
-parameter style java language java
-external name 'org.apache.derbyTesting.functionTests.util.StaticInitializers.DMLInStaticInitializer.getANumber'
-no sql;
-0 rows inserted/updated/deleted
-ij> create function insertstatic() returns INT
-parameter style java language java
-external name 'org.apache.derbyTesting.functionTests.util.StaticInitializers.InsertInStaticInitializer.getANumber'
-no sql;
-0 rows inserted/updated/deleted
-ij> commit;
-ij> -- the static initializer in DMLInStaticInitializer will select from t1 
--- the DML will be executed within a nested query-- however all locks 
--- on system tables which the static initializer gets should be released.
-select 
-(dmlstatic()) 
-from sys.systables where tablename = 'SYSCONGLOMERATES';
-1          
------------
-Caught exception java.sql.SQLException: The external routine is not allowed to execute SQL statements.
-java.sql.SQLException: The external routine is not allowed to execute SQL statements.
-Caused by: ERROR 38001: The external routine is not allowed to execute SQL statements.
-	... 29 more
-1          
-ij> select TYPE, MODE, TABLENAME, LOCKNAME, STATE from syscs_diag.lock_table
-order by 1;
-TYPE |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ij> commit;
-ij> drop table t1;
-0 rows inserted/updated/deleted
-ij> create table t1 (s int);
-0 rows inserted/updated/deleted
-ij> commit;
-ij> select 
-(insertstatic()) 
-from sys.systables where tablename = 'SYSCONGLOMERATES';
-1          
------------
-Caught exception java.sql.SQLException: The external routine is not allowed to execute SQL statements.
-java.sql.SQLException: The external routine is not allowed to execute SQL statements.
-Caused by: ERROR 38001: The external routine is not allowed to execute SQL statements.
-	... 30 more
-1          
-ij> -- only two locks!
-select TYPE, MODE, TABLENAME, LOCKNAME, STATE from syscs_diag.lock_table
-order by 1;
-TYPE |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ij> -- verify that the row went into t1.
-select * from t1;
-S          
------------
-ij> drop table t1;
-0 rows inserted/updated/deleted
-ij> commit;
-ij> select TYPE, MODE, TABLENAME, LOCKNAME, STATE from syscs_diag.lock_table
-order by 1;
-TYPE |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ij> commit;
-ij> -- some really simple tests to start off.
-create table test_tab (x int);
-0 rows inserted/updated/deleted
-ij> insert into test_tab values (1);
-1 row inserted/updated/deleted
-ij> commit;
-ij> -- earlier we would get a bunch of locks on the system catalogs 
--- when trying to resolve the method alias.
-select count(*) from syscs_diag.lock_table;
-1          
------------
-0          
-ij> -- select from a system catalog.
-select count(*) from sys.sysviews;
-1          
------------
-0          
-ij> -- look ma, no locks.
-select count(*) from syscs_diag.lock_table;
-1          
------------
-0          
-ij> insert into test_tab values (2);
-1 row inserted/updated/deleted
-ij> -- only see locks on test_tab, none on system catalogs
--- 
-select TYPE, MODE, TABLENAME, LOCKNAME, STATE from syscs_diag.lock_table
-order by 1;
-TYPE |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ROW  |X   |TEST_TAB                                                                                                                        |(1,8)               |GRANT
-TABLE|IX  |TEST_TAB                                                                                                                        |Tablelock           |GRANT
-ij> -- bugid 3214, atlas case: 962505
--- selecting from a table would hold locks which would disallow creating
--- another table.
-drop table t1;
-ERROR 42Y55: 'DROP TABLE' cannot be performed on 'T1' because it does not exist.
-ij> create table t1 (x int);
-0 rows inserted/updated/deleted
-ij> commit;
-ij> select * from t1;
-X          
------------
-ij> connect 'wombat' as conn1;
-ij(CONN1)> -- this should not time out waiting for locks.
-create table t2 (x int);
-0 rows inserted/updated/deleted
-ij(CONN1)> drop table t2;
-0 rows inserted/updated/deleted
-ij(CONN1)> set connection connection0;
-ij(CONNECTION0)> disconnect conn1;
-ij> commit;
-ij> show connections;
-CONNECTION0* - 	jdbc:derby:wombat
-* = current connection
-ij> -- create table again to force scanning system catalogs.
-drop table test_tab;
-0 rows inserted/updated/deleted
-ij> create table test_tab (x int);
-0 rows inserted/updated/deleted
-ij> insert into test_tab values (1);
-1 row inserted/updated/deleted
-ij> commit;
-ij> -- prepare a statement-- no locks.
-prepare cursor1 as 'update test_tab set x=2 where x=?';
-ij> select count(*) from syscs_diag.lock_table;
-1          
------------
-0          
-ij> -- now execute it-- should see locks on test_tab
-execute cursor1 using 'values (1)';
-1 row inserted/updated/deleted
-ij> select TYPE, MODE, TABLENAME, LOCKNAME, STATE from syscs_diag.lock_table
-order by 1;
-TYPE |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ROW  |X   |TEST_TAB                                                                                                                        |(1,7)               |GRANT
-TABLE|IX  |TEST_TAB                                                                                                                        |Tablelock           |GRANT
-ij> commit;
-ij> -- problem with backing index scans.
-create table t (c1 int not null primary key, c2 int references t);
-0 rows inserted/updated/deleted
-ij> insert into t values (1,1);
-1 row inserted/updated/deleted
-ij> insert into t values (2,1);
-1 row inserted/updated/deleted
-ij> commit;
-ij> prepare ps as 'select * from t where c1 = ? and c2 = ?';
-ij> -- no locks, no locks at all.
-select * from syscs_diag.lock_table;
-XID            |TYPE |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE|TABLETYPE|LOCK&|INDEXNAME                                                                                                                       
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ij> -- clear DataDictionary cache
-create table x(c1 int);
-0 rows inserted/updated/deleted
-ij> drop table x;
-0 rows inserted/updated/deleted
-ij> commit;
-ij> -- try inserting into the table; no locks on system catalogs.
-prepare pi as 'insert into t values (3,2)';
-ij> select * from syscs_diag.lock_table;
-XID            |TYPE |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE|TABLETYPE|LOCK&|INDEXNAME                                                                                                                       
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ij> commit;
-ij> -- clear DataDictionary cache
-create table x(c1 int);
-0 rows inserted/updated/deleted
-ij> drop table x;
-0 rows inserted/updated/deleted
-ij> commit;
-ij> -- try updating the table; no locks on system catalogs.
-prepare p1 as 'update t set c2 = c1, c1 = c2';
-ij> select * from syscs_diag.lock_table;
-XID            |TYPE |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE|TABLETYPE|LOCK&|INDEXNAME                                                                                                                       
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ij> commit;
-ij> -- clear DataDictionary cache
-create table x(c1 int);
-0 rows inserted/updated/deleted
-ij> drop table x;
-0 rows inserted/updated/deleted
-ij> commit;
-ij> -- try deleting from the table; no locks on system catalogs.
-prepare p1 as 'delete from t';
-ij> select * from syscs_diag.lock_table;
-XID            |TYPE |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE|TABLETYPE|LOCK&|INDEXNAME                                                                                                                       
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ij> commit;
-ij> -- create some triggers.
-create trigger update_of_t after update on t for each row mode db2sql values 2;
-0 rows inserted/updated/deleted
-ij> create trigger insert_of_t after insert on t for each row mode db2sql values 3;
-0 rows inserted/updated/deleted
-ij> commit;
-ij> -- t has (1,1) (2,1) (3,2)
-prepare pu as 'update t set c2=2 where c1=2';
-ij> select * from syscs_diag.lock_table;
-XID            |TYPE |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE|TABLETYPE|LOCK&|INDEXNAME                                                                                                                       
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-ij> commit;
-ij> 
+ij> autocommit off;
+ij> -- move static initializer tests to front, hoping to avoid class garbage
+-- collection in jdk18.  Sometimes the static initializer in the 
+-- DMLInStaticInitializer and InsertInStaticInitializer classes gets called
+-- twice in jdk118 - causing a diff.  This can happen if for some reason the
+-- JVM decides to garbage collect the class between references to the class
+-- in the course of executing the query.
+-- static initializers.
+create table t1 (s int);
+0 rows inserted/updated/deleted
+ij> commit;
+ij> create function dmlstatic() returns INT
+parameter style java language java
+external name 'org.apache.derbyTesting.functionTests.util.StaticInitializers.DMLInStaticInitializer.getANumber'
+no sql;
+0 rows inserted/updated/deleted
+ij> create function insertstatic() returns INT
+parameter style java language java
+external name 'org.apache.derbyTesting.functionTests.util.StaticInitializers.InsertInStaticInitializer.getANumber'
+no sql;
+0 rows inserted/updated/deleted
+ij> commit;
+ij> -- the static initializer in DMLInStaticInitializer will select from t1 
+-- the DML will be executed within a nested query-- however all locks 
+-- on system tables which the static initializer gets should be released.
+select 
+(dmlstatic()) 
+from sys.systables where tablename = 'SYSCONGLOMERATES';
+1          
+-----------
+Caught exception SQL Exception: The external routine is not allowed to execute SQL statements.
+SQL Exception: The external routine is not allowed to execute SQL statements.
+Caused by: ERROR 38001: The external routine is not allowed to execute SQL statements.
+	... 29 more
+1          
+ij> select TYPE, MODE, TABLENAME, LOCKNAME, STATE from syscs_diag.lock_table
+order by 1;
+TYPE |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ij> commit;
+ij> drop table t1;
+0 rows inserted/updated/deleted
+ij> create table t1 (s int);
+0 rows inserted/updated/deleted
+ij> commit;
+ij> select 
+(insertstatic()) 
+from sys.systables where tablename = 'SYSCONGLOMERATES';
+1          
+-----------
+Caught exception SQL Exception: The external routine is not allowed to execute SQL statements.
+SQL Exception: The external routine is not allowed to execute SQL statements.
+Caused by: ERROR 38001: The external routine is not allowed to execute SQL statements.
+	... 30 more
+1          
+ij> -- only two locks!
+select TYPE, MODE, TABLENAME, LOCKNAME, STATE from syscs_diag.lock_table
+order by 1;
+TYPE |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ij> -- verify that the row went into t1.
+select * from t1;
+S          
+-----------
+ij> drop table t1;
+0 rows inserted/updated/deleted
+ij> commit;
+ij> select TYPE, MODE, TABLENAME, LOCKNAME, STATE from syscs_diag.lock_table
+order by 1;
+TYPE |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ij> commit;
+ij> -- some really simple tests to start off.
+create table test_tab (x int);
+0 rows inserted/updated/deleted
+ij> insert into test_tab values (1);
+1 row inserted/updated/deleted
+ij> commit;
+ij> -- earlier we would get a bunch of locks on the system catalogs 
+-- when trying to resolve the method alias.
+select count(*) from syscs_diag.lock_table;
+1          
+-----------
+0          
+ij> -- select from a system catalog.
+select count(*) from sys.sysviews;
+1          
+-----------
+0          
+ij> -- look ma, no locks.
+select count(*) from syscs_diag.lock_table;
+1          
+-----------
+0          
+ij> insert into test_tab values (2);
+1 row inserted/updated/deleted
+ij> -- only see locks on test_tab, none on system catalogs
+-- 
+select TYPE, MODE, TABLENAME, LOCKNAME, STATE from syscs_diag.lock_table
+order by 1;
+TYPE |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ROW  |X   |TEST_TAB                                                                                                                        |(1,8)               |GRANT
+TABLE|IX  |TEST_TAB                                                                                                                        |Tablelock           |GRANT
+ij> -- bugid 3214, atlas case: 962505
+-- selecting from a table would hold locks which would disallow creating
+-- another table.
+drop table t1;
+ERROR 42Y55: 'DROP TABLE' cannot be performed on 'T1' because it does not exist.
+ij> create table t1 (x int);
+0 rows inserted/updated/deleted
+ij> commit;
+ij> select * from t1;
+X          
+-----------
+ij> connect 'wombat' as conn1;
+ij(CONN1)> -- this should not time out waiting for locks.
+create table t2 (x int);
+0 rows inserted/updated/deleted
+ij(CONN1)> drop table t2;
+0 rows inserted/updated/deleted
+ij(CONN1)> set connection connection0;
+ij(CONNECTION0)> disconnect conn1;
+ij> commit;
+ij> show connections;
+CONNECTION0* - 	jdbc:derby:wombat
+* = current connection
+ij> -- create table again to force scanning system catalogs.
+drop table test_tab;
+0 rows inserted/updated/deleted
+ij> create table test_tab (x int);
+0 rows inserted/updated/deleted
+ij> insert into test_tab values (1);
+1 row inserted/updated/deleted
+ij> commit;
+ij> -- prepare a statement-- no locks.
+prepare cursor1 as 'update test_tab set x=2 where x=?';
+ij> select count(*) from syscs_diag.lock_table;
+1          
+-----------
+0          
+ij> -- now execute it-- should see locks on test_tab
+execute cursor1 using 'values (1)';
+1 row inserted/updated/deleted
+ij> select TYPE, MODE, TABLENAME, LOCKNAME, STATE from syscs_diag.lock_table
+order by 1;
+TYPE |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ROW  |X   |TEST_TAB                                                                                                                        |(1,7)               |GRANT
+TABLE|IX  |TEST_TAB                                                                                                                        |Tablelock           |GRANT
+ij> commit;
+ij> -- problem with backing index scans.
+create table t (c1 int not null primary key, c2 int references t);
+0 rows inserted/updated/deleted
+ij> insert into t values (1,1);
+1 row inserted/updated/deleted
+ij> insert into t values (2,1);
+1 row inserted/updated/deleted
+ij> commit;
+ij> prepare ps as 'select * from t where c1 = ? and c2 = ?';
+ij> -- no locks, no locks at all.
+select * from syscs_diag.lock_table;
+XID            |TYPE |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE|TABLETYPE|LOCK&|INDEXNAME                                                                                                                       
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ij> -- clear DataDictionary cache
+create table x(c1 int);
+0 rows inserted/updated/deleted
+ij> drop table x;
+0 rows inserted/updated/deleted
+ij> commit;
+ij> -- try inserting into the table; no locks on system catalogs.
+prepare pi as 'insert into t values (3,2)';
+ij> select * from syscs_diag.lock_table;
+XID            |TYPE |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE|TABLETYPE|LOCK&|INDEXNAME                                                                                                                       
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ij> commit;
+ij> -- clear DataDictionary cache
+create table x(c1 int);
+0 rows inserted/updated/deleted
+ij> drop table x;
+0 rows inserted/updated/deleted
+ij> commit;
+ij> -- try updating the table; no locks on system catalogs.
+prepare p1 as 'update t set c2 = c1, c1 = c2';
+ij> select * from syscs_diag.lock_table;
+XID            |TYPE |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE|TABLETYPE|LOCK&|INDEXNAME                                                                                                                       
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ij> commit;
+ij> -- clear DataDictionary cache
+create table x(c1 int);
+0 rows inserted/updated/deleted
+ij> drop table x;
+0 rows inserted/updated/deleted
+ij> commit;
+ij> -- try deleting from the table; no locks on system catalogs.
+prepare p1 as 'delete from t';
+ij> select * from syscs_diag.lock_table;
+XID            |TYPE |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE|TABLETYPE|LOCK&|INDEXNAME                                                                                                                       
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ij> commit;
+ij> -- create some triggers.
+create trigger update_of_t after update on t for each row mode db2sql values 2;
+0 rows inserted/updated/deleted
+ij> create trigger insert_of_t after insert on t for each row mode db2sql values 3;
+0 rows inserted/updated/deleted
+ij> commit;
+ij> -- t has (1,1) (2,1) (3,2)
+prepare pu as 'update t set c2=2 where c1=2';
+ij> select * from syscs_diag.lock_table;
+XID            |TYPE |MODE|TABLENAME                                                                                                                       |LOCKNAME            |STATE|TABLETYPE|LOCK&|INDEXNAME                                                                                                                       
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ij> commit;
+ij> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testij.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testij.java?rev=391384&r1=391383&r2=391384&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testij.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testij.java Tue Apr  4 11:47:34 2006
@@ -159,7 +159,7 @@
         original.close();
         Sed hostSed = new Sed();
         InputStream sedIs = new ByteArrayInputStream(("substitute=localhost;" + hostName).getBytes("UTF-8"));
-        hostSed.exec(tmpFile, orgFile, sedIs, false, false);		
+        hostSed.exec(tmpFile, orgFile, sedIs, false, false, false);		
     }
 
 	public static void main (String args[]) throws Exception



Mime
View raw message