db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r179696 [2/8] - in /incubator/derby/code/trunk/java: engine/org/apache/derby/loc/ testing/org/apache/derbyTesting/functionTests/master/ testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ testing/org/apache/derbyTesting/functionTests/master/jdk14/
Date Fri, 03 Jun 2005 01:54:33 GMT
Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/importExport.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/importExport.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/importExport.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/importExport.out Thu Jun  2 18:54:29 2005
@@ -2,7 +2,7 @@
 testing non-existing data file
 The exception 'SQL Exception: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.' was thrown while evaluating an expression. SQLSTATE: 38000: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression. SQLSTATE: XJ001: Java exception: ': java.lang.reflect.InvocationTargetException'. SQLSTATE: XIE04: Data file not found: extinout/Z.dat
 testing null data file
-The exception 'SQL Exception: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.' was thrown while evaluating an expression. SQLSTATE: 38000: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression. SQLSTATE: XJ001: Java exception: ': java.lang.reflect.InvocationTargetException'. SQLSTATE: XIE05: Data file can not 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: 38000: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression. SQLSTATE: XJ001: Java exception: ': java.lang.reflect.InvocationTargetException'. SQLSTATE: XIE05: Data file cannot be null. 
 testing empty table
 testing empty table with Delimited format
 testing empty table import Field/Char Delimiters
@@ -13,11 +13,11 @@
 testing IE with delimiters(%, &) and Cp1252
 testing IE with delimiters(%, &) and UTF-16
 testing IE with delimiters(^, #) and WRONG ENCODEINGH
-Got IOException while writing data to the file
+An IOException occurred while writing data to the file.
 testing datatypes that does not have Export Supprt
-Column 'C1' in the table is of type BLOB, it is not supported by import/export.
-Column 'C1' in the table is of type BLOB, it is not supported by import/export.
-The exception 'SQL Exception: Read endOfFile at unexpected place on line 2' was thrown while evaluating an expression. SQLSTATE: XIE0E: Read endOfFile at unexpected place on line 2
+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 'SQL Exception: Read endOfFile at unexpected place on line 2.' was thrown while evaluating an expression. SQLSTATE: XIE0E: Read 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: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedure.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedure.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedure.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedure.out Thu Jun  2 18:54:29 2005
@@ -1,8 +1,8 @@
 testNegative
 create procedure asdf() language java external name 'asdfasdf' parameter style java
-EXPECTED SQL Exception: (42Y04) Cannot create a procedure or function with EXTERNAL NAME 'asdfasdf' because it is not a dot separated list. The expected format is <full java path>.<method name> .
+EXPECTED SQL Exception: (42Y04) Cannot create a procedure or function with EXTERNAL NAME 'asdfasdf' because it is not a list separated by periods. The expected format is <full java path>.<method name>.
 create procedure asdf() language java external name 'asdfasdf.' parameter style java
-EXPECTED SQL Exception: (42Y04) Cannot create a procedure or function with EXTERNAL NAME 'asdfasdf.' because it is not a dot separated list. The expected format is <full java path>.<method name> .
+EXPECTED SQL Exception: (42Y04) Cannot create a procedure or function with EXTERNAL NAME 'asdfasdf.' because it is not a list separated by periods. The expected format is <full java path>.<method name>.
 create procedure a23456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789() language java external name 'asdf.asdf' parameter style java
 EXPECTED SQL Exception: (42622) The name 'A23456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789' is too long. The maximum length is '128'.
 create procedure asdf language java external name java.lang.Thread.currentThread parameter style java
@@ -55,11 +55,11 @@
 call noclass()
 EXPECTED SQL Exception: (42X51) The class 'asdf' does not exist or is inaccessible. This can happen if the class is not public. SQLSTATE: XJ001: Java exception: 'asdf: java.lang.ClassNotFoundException'.
 call nomethod()
-EXPECTED SQL Exception: (42X50) No method was found to be able to match method call java.lang.Integer.asdf(), even tried all combinations of object and primitive types and any possible type conversion for any parameters the method call may have.  It may be that the method exists, but it is not public and/or static, or that the parameter types are not method invocation convertible.
+EXPECTED SQL Exception: (42X50) No method was found that matched the method call java.lang.Integer.asdf(), tried all combinations of object and primitive types and any possible type conversion for any  parameters the method call may have. The method might exist but it is not public and/or static, or the parameter types are not method invocation convertible.
 call notstatic()
-EXPECTED SQL Exception: (42X50) No method was found to be able to match method call java.lang.Integer.equals(), even tried all combinations of object and primitive types and any possible type conversion for any parameters the method call may have.  It may be that the method exists, but it is not public and/or static, or that the parameter types are not method invocation convertible.
+EXPECTED SQL Exception: (42X50) No method was found that matched the method call java.lang.Integer.equals(), tried all combinations of object and primitive types and any possible type conversion for any  parameters the method call may have. The method might exist but it is not public and/or static, or the parameter types are not method invocation convertible.
 call notvoid()
-EXPECTED SQL Exception: (42X50) No method was found to be able to match method call void java.lang.Runtime.getRuntime(), even tried all combinations of object and primitive types and any possible type conversion for any parameters the method call may have.  It may be that the method exists, but it is not public and/or static, or that the parameter types are not method invocation convertible.
+EXPECTED SQL Exception: (42X50) No method was found that matched the method call void java.lang.Runtime.getRuntime(), tried all combinations of object and primitive types and any possible type conversion for any  parameters the method call may have. The method might exist but it is not public and/or static, or the parameter types are not method invocation convertible.
 testDuplicates
 create procedure PROCDUP() language java external name 'failAPP.fail0' parameter style java
 EXPECTED SQL Exception: (X0Y68) PROCEDURE 'PROCDUP' already exists.
@@ -82,7 +82,7 @@
 call AMBIGIOUS01(?, ?)
 EXPECTED SQL Exception: (42X73) Method resolution for signature org.apache.derbyTesting.functionTests.util.ProcedureTest.ambigious1(int, java.lang.String, [Ljava.sql.ResultSet;) was ambiguous. (No single maximally specific method.)
 call AMBIGIOUS02(?, ?)
-EXPECTED SQL Exception: (42X50) No method was found to be able to match method call org.apache.derbyTesting.functionTests.util.ProcedureTest.ambigious2(int, int, java.sql.ResultSet[]), even tried all combinations of object and primitive types and any possible type conversion for any parameters the method call may have.  It may be that the method exists, but it is not public and/or static, or that the parameter types are not method invocation convertible.
+EXPECTED SQL Exception: (42X50) No method was found that matched the method call org.apache.derbyTesting.functionTests.util.ProcedureTest.ambigious2(int, int, java.sql.ResultSet[]), tried all combinations of object and primitive types and any possible type conversion for any  parameters the method call may have. The method might exist but it is not public and/or static, or the parameter types are not method invocation convertible.
 No ResultSet or update count returned
 No ResultSet or update count returned
 zeroArgProcedures
@@ -182,9 +182,9 @@
 6 |'012345678     
 7 |int            
 CALL IRDRS(?)
-EXPECTED SQL Exception: (42X50) No method was found to be able to match method call org.apache.derbyTesting.functionTests.util.ProcedureTest.missingDynamicParameter(int, java.sql.ResultSet[]), even tried all combinations of object and primitive types and any possible type conversion for any parameters the method call may have.  It may be that the method exists, but it is not public and/or static, or that the parameter types are not method invocation convertible.
+EXPECTED SQL Exception: (42X50) No method was found that matched the method call org.apache.derbyTesting.functionTests.util.ProcedureTest.missingDynamicParameter(int, java.sql.ResultSet[]), tried all combinations of object and primitive types and any possible type conversion for any  parameters the method call may have. The method might exist but it is not public and/or static, or the parameter types are not method invocation convertible.
 CALL rsi(?)
-EXPECTED SQL Exception: (42X50) No method was found to be able to match method call org.apache.derbyTesting.functionTests.util.ProcedureTest.badDynamicParameter(int, java.sql.ResultSet[]), even tried all combinations of object and primitive types and any possible type conversion for any parameters the method call may have.  It may be that the method exists, but it is not public and/or static, or that the parameter types are not method invocation convertible.
+EXPECTED SQL Exception: (42X50) No method was found that matched the method call org.apache.derbyTesting.functionTests.util.ProcedureTest.badDynamicParameter(int, java.sql.ResultSet[]), tried all combinations of object and primitive types and any possible type conversion for any  parameters the method call may have. The method might exist but it is not public and/or static, or the parameter types are not method invocation convertible.
 no dynamic result sets
 No ResultSet or update count returned
 Testing too many result sets

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/updatableResultSet.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/updatableResultSet.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/updatableResultSet.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/updatableResultSet.out Thu Jun  2 18:54:29 2005
@@ -83,13 +83,13 @@
 Got expected exception Invalid operation: result set closed
 Negative Test9 - try updatable resultset on system table
 SQL State : 42Y90
-Got expected exception FOR UPDATE is not permitted on this type of statement.
+Got expected exception FOR UPDATE is not permitted in this type of statement.  
 Negative Test10 - try updatable resultset on a view
 SQL State : 42Y90
-Got expected exception FOR UPDATE is not permitted on this type of statement.
+Got expected exception FOR UPDATE is not permitted in this type of statement.  
 Negative Test11 - attempt to open updatable resultset when there is join in the select query should fail
 SQL State : 42Y90
-Got expected exception FOR UPDATE is not permitted on this type of statement.
+Got expected exception FOR UPDATE is not permitted in this type of statement.  
 Negative Test12 - With autocommit on, attempt to drop a table when there is an open updatable resultset on it
 Opened an updatable resultset. Now trying to drop that table through another Statement
 SQL State : X0X95

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/LOB.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/LOB.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/LOB.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/LOB.out Thu Jun  2 18:54:29 2005
@@ -66,7 +66,7 @@
 ij> insert into b(blob, clob, nclob) values(cast(X'0031' as blob(3K)),cast('2' as clob(2M)));
 ERROR 42X14: 'NCLOB' is not a column in table or VTI 'APP.B'.
 ij> select b.blob, b.clob, b.nclob from b;
-ERROR 42X04: Column 'B.NCLOB' is not in any table in the FROM list or it appears within a join specification and is outside the scope of the join specification or it appears in a HAVING clause and is not in the GROUP BY list.  If this is a CREATE or ALTER TABLE statement then 'B.NCLOB' is not a column in the target table.
+ERROR 42X04: Column 'B.NCLOB' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then 'B.NCLOB' is not a column in the target table.
 ij> -- equal tests are not allowed
 select 1 from b where cast(X'e0' as blob(5))=cast(X'e0' as blob(5));
 ERROR 42818: Comparisons between 'BLOB' and 'BLOB' are not supported.
@@ -117,14 +117,14 @@
 ij> select * from b as b1, b as b2 where X'7575'=b1.blob;
 ERROR 42818: Comparisons between 'CHAR () FOR BIT DATA' and 'BLOB' are not supported.
 ij> select b.blob, b.clob, b.nclob from b where b.blob = '1' and b.clob = '2' and b.nclob = '3';
-ERROR 42X04: Column 'B.NCLOB' is not in any table in the FROM list or it appears within a join specification and is outside the scope of the join specification or it appears in a HAVING clause and is not in the GROUP BY list.  If this is a CREATE or ALTER TABLE statement then 'B.NCLOB' is not a column in the target table.
+ERROR 42X04: Column 'B.NCLOB' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then 'B.NCLOB' is not a column in the target table.
 ij> select b.blob from b where b.blob = '1';
 ERROR 42818: Comparisons between 'BLOB' and 'CHAR' are not supported.
 ij> -- however it works for types which cloudscape autocasts to char
 select b.clob from b where b.clob = '2';
 ERROR 42818: Comparisons between 'CLOB' and 'CHAR' are not supported.
 ij> select b.nclob from b where b.nclob = '3';
-ERROR 42X04: Column 'B.NCLOB' is not in any table in the FROM list or it appears within a join specification and is outside the scope of the join specification or it appears in a HAVING clause and is not in the GROUP BY list.  If this is a CREATE or ALTER TABLE statement then 'B.NCLOB' is not a column in the target table.
+ERROR 42X04: Column 'B.NCLOB' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then 'B.NCLOB' is not a column in the target table.
 ij> -- test insert of NULL
 insert into b values(null, null, null);
 ERROR 42802: The number of values assigned is not the same as the number of specified or implied columns.
@@ -266,13 +266,13 @@
 0 rows inserted/updated/deleted
 ij> -- create index (not allowed)
 create index ia on a(a);
-ERROR X0X67: Columns of type 'BLOB' may not be used in CREATE INDEX, ORDER BY, GROUP BY, UNION, INTERSECT, EXCEPT or DISTINCT, because comparisons are not supported for that type.
+ERROR X0X67: Columns of type 'BLOB' may not be used in CREATE INDEX, ORDER BY, GROUP BY, UNION, INTERSECT, EXCEPT or DISTINCT statements because comparisons are not supported for that type.
 ij> create index ib on b(a);
-ERROR X0X67: Columns of type 'CLOB' may not be used in CREATE INDEX, ORDER BY, GROUP BY, UNION, INTERSECT, EXCEPT or DISTINCT, because comparisons are not supported for that type.
+ERROR X0X67: Columns of type 'CLOB' may not be used in CREATE INDEX, ORDER BY, GROUP BY, UNION, INTERSECT, EXCEPT or DISTINCT statements because comparisons are not supported for that type.
 ij> create index ic on c(a);
 ERROR 42Y55: 'CREATE INDEX' cannot be performed on 'C' because it does not exist.
 ij> create index id on d(a);
-ERROR X0X67: Columns of type 'CLOB' may not be used in CREATE INDEX, ORDER BY, GROUP BY, UNION, INTERSECT, EXCEPT or DISTINCT, because comparisons are not supported for that type.
+ERROR X0X67: Columns of type 'CLOB' may not be used in CREATE INDEX, ORDER BY, GROUP BY, UNION, INTERSECT, EXCEPT or DISTINCT statements because comparisons are not supported for that type.
 ij> -- cleanup
 drop table a;
 0 rows inserted/updated/deleted
@@ -535,7 +535,7 @@
 1 row inserted/updated/deleted
 ij> -- UNION
 select * from testPredicate1 union select * from testPredicate2;
-ERROR X0X67: Columns of type 'LONG VARCHAR' may not be used in CREATE INDEX, ORDER BY, GROUP BY, UNION, INTERSECT, EXCEPT or DISTINCT, because comparisons are not supported for that type.
+ERROR X0X67: Columns of type 'LONG VARCHAR' may not be used in CREATE INDEX, ORDER BY, GROUP BY, UNION, INTERSECT, EXCEPT or DISTINCT statements because comparisons are not supported for that type.
 ij> -- IN predicate
 select c1 from testPredicate1 where c1 IN (select c1 from testPredicate2);
 ERROR 42818: Comparisons between 'LONG VARCHAR' and 'LONG VARCHAR' are not supported.
@@ -544,10 +544,10 @@
 ERROR 42818: Comparisons between 'LONG VARCHAR' and 'LONG VARCHAR' are not supported.
 ij> -- ORDER BY clause
 select * from testPredicate1 order by c1;
-ERROR X0X67: Columns of type 'LONG VARCHAR' may not be used in CREATE INDEX, ORDER BY, GROUP BY, UNION, INTERSECT, EXCEPT or DISTINCT, because comparisons are not supported for that type.
+ERROR X0X67: Columns of type 'LONG VARCHAR' may not be used in CREATE INDEX, ORDER BY, GROUP BY, UNION, INTERSECT, EXCEPT or DISTINCT statements because comparisons are not supported for that type.
 ij> -- GROUP BY clause
 select substr(c1,1,2) from testPredicate1 group by c1;
-ERROR X0X67: Columns of type 'LONG VARCHAR' may not be used in CREATE INDEX, ORDER BY, GROUP BY, UNION, INTERSECT, EXCEPT or DISTINCT, because comparisons are not supported for that type.
+ERROR X0X67: Columns of type 'LONG VARCHAR' may not be used in CREATE INDEX, ORDER BY, GROUP BY, UNION, INTERSECT, EXCEPT or DISTINCT statements because comparisons are not supported for that type.
 ij> -- JOIN
 select * from testPredicate1 t1, testPredicate2 t2 where t1.c1=t2.c1;
 ERROR 42818: Comparisons between 'LONG VARCHAR' and 'LONG VARCHAR' are not supported.
@@ -555,15 +555,15 @@
 ERROR 42818: Comparisons between 'LONG VARCHAR' and 'LONG VARCHAR' are not supported.
 ij> -- PRIMARY KEY
 create table testConst1(c1 long varchar not null primary key);
-ERROR X0X67: Columns of type 'LONG VARCHAR' may not be used in CREATE INDEX, ORDER BY, GROUP BY, UNION, INTERSECT, EXCEPT or DISTINCT, because comparisons are not supported for that type.
+ERROR X0X67: Columns of type 'LONG VARCHAR' may not be used in CREATE INDEX, ORDER BY, GROUP BY, UNION, INTERSECT, EXCEPT or DISTINCT statements because comparisons are not supported for that type.
 ij> -- UNIQUE KEY constraints
 CREATE TABLE testconst2 (col1 long varchar not null, CONSTRAINT uk UNIQUE (col1));
-ERROR X0X67: Columns of type 'LONG VARCHAR' may not be used in CREATE INDEX, ORDER BY, GROUP BY, UNION, INTERSECT, EXCEPT or DISTINCT, because comparisons are not supported for that type.
+ERROR X0X67: Columns of type 'LONG VARCHAR' may not be used in CREATE INDEX, ORDER BY, GROUP BY, UNION, INTERSECT, EXCEPT or DISTINCT statements because comparisons are not supported for that type.
 ij> -- FOREIGN KEY constraints
 create table testConst3 (c1 char(10) not null, primary key (c1));
 0 rows inserted/updated/deleted
 ij> create table testConst4 (c1 long varchar not null, constraint fk foreign key (c1) references testConst3 (c1));
-ERROR X0X67: Columns of type 'LONG VARCHAR' may not be used in CREATE INDEX, ORDER BY, GROUP BY, UNION, INTERSECT, EXCEPT or DISTINCT, because comparisons are not supported for that type.
+ERROR X0X67: Columns of type 'LONG VARCHAR' may not be used in CREATE INDEX, ORDER BY, GROUP BY, UNION, INTERSECT, EXCEPT or DISTINCT statements because comparisons are not supported for that type.
 ij> drop table testConst3;
 0 rows inserted/updated/deleted
 ij> -- MAX aggregate function

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/aes.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/aes.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/aes.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/aes.out Thu Jun  2 18:54:29 2005
@@ -143,7 +143,7 @@
 -- 1.5.1 -ve cases:  AES - unsupported feedback mode
 connect 'jdbc:derby:encdb_abc;create=true;dataEncryption=true;encryptionAlgorithm=AES/ABC/NoPadding;bootPassword=Thursday';
 ERROR XJ041: Failed to create database 'encdb_abc', see the next exception for details.
-ERROR XBM01: Startup failed due to an exception, see next exception for details.
+ERROR XBM01: Startup failed due to an exception. See next exception for details. 
 ERROR XBCXI: The feedback mode 'ABC' is not supported. Supported feedback modes are CBC, CFB, OFB and ECB.
 ij> autocommit off;
 IJ ERROR: Unable to establish connection
@@ -155,7 +155,7 @@
 -- 2.1 -ve cases:  AES - unsupported padding mode
 connect 'jdbc:derby:encdb_pkcs5;create=true;dataEncryption=true;encryptionAlgorithm=AES/ECB/PKCS5Padding;bootPassword=Thursday';
 ERROR XJ041: Failed to create database 'encdb_pkcs5', see the next exception for details.
-ERROR XBM01: Startup failed due to an exception, see next exception for details.
+ERROR XBM01: Startup failed due to an exception. See next exception for details. 
 ERROR XBCXB: Bad encryption padding 'PKCS5Padding' or padding not specified. 'NoPadding' must be used.
 ij> autocommit off;
 IJ ERROR: Unable to establish connection
@@ -202,7 +202,7 @@
 -- 3.4 unsupported key length
 connect 'jdbc:derby:encdbcbc_512;create=true;dataEncryption=true;encryptionKeyLength=512;encryptionAlgorithm=AES/CBC/NoPadding;bootPassword=Thursday';
 ERROR XJ041: Failed to create database 'encdbcbc_512', see the next exception for details.
-ERROR XBM01: Startup failed due to an exception, see next exception for details.
+ERROR XBM01: Startup failed due to an exception. See next exception for details. 
 ERROR XJ001: Java exception: 'Wrong keysize: must be equal to 128, 192 or 256: java.security.InvalidParameterException'.
 ij> autocommit off;
 IJ ERROR: Unable to establish connection

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/aggregate.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/aggregate.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/aggregate.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/aggregate.out Thu Jun  2 18:54:29 2005
@@ -803,14 +803,14 @@
 ij> -- TEMPORARY RESTRICTION, aggregates in the select list
 -- of a subquery on an aggregated result set
 select max(c1), (select max(c1) from t2) from t1;
-ERROR 42Y29: The SELECT list of a non-grouped query contains at least 1 invalid expression.  When the SELECT list contains at least 1 aggregate then all entries must be valid aggregate expressions.
+ERROR 42Y29: The SELECT list of a non-grouped query contains at least one invalid expression. When the SELECT list contains at least one aggregate then all entries must be valid aggregate expressions.
 ij> select max(c1), (select max(t1.c1) from t2) from t1;
-ERROR 42Y29: The SELECT list of a non-grouped query contains at least 1 invalid expression.  When the SELECT list contains at least 1 aggregate then all entries must be valid aggregate expressions.
+ERROR 42Y29: The SELECT list of a non-grouped query contains at least one invalid expression. When the SELECT list contains at least one aggregate then all entries must be valid aggregate expressions.
 ij> select max(c1), max(c1), (select max(c1) from t1) from t1;
-ERROR 42Y29: The SELECT list of a non-grouped query contains at least 1 invalid expression.  When the SELECT list contains at least 1 aggregate then all entries must be valid aggregate expressions.
+ERROR 42Y29: The SELECT list of a non-grouped query contains at least one invalid expression. When the SELECT list contains at least one aggregate then all entries must be valid aggregate expressions.
 ij> -- cursor with aggregate is not updatable
 get cursor c1 as 'select max(i) from t group by i for update';
-ERROR 42Y90: FOR UPDATE is not permitted on this type of statement.
+ERROR 42Y90: FOR UPDATE is not permitted in this type of statement.  
 ij> -- max over a join on a column with an index -- Beetle 4423
 create table t3(a int);
 0 rows inserted/updated/deleted

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/altertable.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/altertable.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/altertable.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/altertable.out Thu Jun  2 18:54:29 2005
@@ -412,7 +412,7 @@
 ij> alter table t4 add constraint t4fk foreign key ("c1") references t0;
 ERROR 42X14: 'c1' is not a column in table or VTI 'T4'.
 ij> alter table t4 add constraint t4ck check ("c1" <> 4);
-ERROR 42X04: Column 'c1' is not in any table in the FROM list or it appears within a join specification and is outside the scope of the join specification or it appears in a HAVING clause and is not in the GROUP BY list.  If this is a CREATE or ALTER TABLE statement then 'c1' is not a column in the target table.
+ERROR 42X04: Column 'c1' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then 'c1' is not a column in the target table.
 ij> -- add primary key to non-empty table with duplicates
 alter table t4 add primary key(c1);
 ERROR 23505: 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 'T4'.
@@ -561,7 +561,7 @@
 ij> create table xxx(c1 int);
 0 rows inserted/updated/deleted
 ij> execute p1;
-ERROR 42X04: Column 'C2' is not in any table in the FROM list or it appears within a join specification and is outside the scope of the join specification or it appears in a HAVING clause and is not in the GROUP BY list.  If this is a CREATE or ALTER TABLE statement then 'C2' is not a column in the target table.
+ERROR 42X04: Column 'C2' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then 'C2' is not a column in the target table.
 ij> alter table xxx add column c2 int;
 0 rows inserted/updated/deleted
 ij> execute p1;
@@ -586,15 +586,15 @@
 -- negative tests
 -- drop non-existent constraint
 alter table t0 drop constraint notexists;
-ERROR 42X86: ALTER table failed. There is no constraint 'APP.NOTEXISTS' on table 'APP.T0'.
+ERROR 42X86: ALTER TABLE failed. There is no constraint 'APP.NOTEXISTS' on table 'APP.T0'. 
 ij> -- constraint/table mismatch
 alter table t1 drop constraint p1;
-ERROR 42X86: ALTER table failed. There is no constraint 'APP.P1' on table 'APP.T1'.
+ERROR 42X86: ALTER TABLE failed. There is no constraint 'APP.P1' on table 'APP.T1'. 
 ij> -- In DB2 compatibility mode, we cann't add a nullable primary key
 alter table t0_1 add constraint p2 primary key(c1);
 ERROR 42831: 'C1' cannot be a column of a primary key or unique key because it can contain null values.
 ij> alter table t0_1 drop constraint p2;
-ERROR 42X86: ALTER table failed. There is no constraint 'APP.P2' on table 'APP.T0_1'.
+ERROR 42X86: ALTER TABLE failed. There is no constraint 'APP.P2' on table 'APP.T0_1'. 
 ij> -- positive tests
 -- verify that we can add/drop/add/drop/... constraints
 alter table t0_1 add column c2 int not null constraint p2 primary key default 0;
@@ -758,7 +758,7 @@
 ERROR 42Y07: Schema 'BADSCHEMA' does not exist
 ij> -- fail
 alter table x drop constraint newschema.newcons;
-ERROR 42X86: ALTER table failed. There is no constraint 'NEWSCHEMA.NEWCONS' on table 'APP.X'.
+ERROR 42X86: ALTER TABLE failed. There is no constraint 'NEWSCHEMA.NEWCONS' on table 'APP.X'. 
 ij> -- ok
 alter table x drop constraint app.newcons;
 0 rows inserted/updated/deleted
@@ -784,7 +784,7 @@
 0 rows inserted/updated/deleted
 ij> -- fail, cannot find emptyschema.conn
 alter table app.x drop constraint emptyschema.con;
-ERROR 42X86: ALTER table failed. There is no constraint 'EMPTYSCHEMA.CON' on table 'APP.X'.
+ERROR 42X86: ALTER TABLE failed. There is no constraint 'EMPTYSCHEMA.CON' on table 'APP.X'. 
 ij> select schemaname, constraintname from sys.sysconstraints c, sys.sysschemas s where s.schemaid = c.schemaid order by 1;
 SCHEMANAME                                                                                                                      |CONSTRAINTNAME                                                                                                                  
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -836,9 +836,9 @@
 1          |1          
 1          |1          
 ij> alter table t1 drop primary key;
-ERROR 42X86: ALTER table failed. There is no constraint 'PRIMARY KEY' on table 'APP.T1'.
+ERROR 42X86: ALTER TABLE failed. There is no constraint 'PRIMARY KEY' on table 'APP.T1'. 
 ij> alter table t1 drop constraint emptyschema.C1;
-ERROR 42X86: ALTER table failed. There is no constraint 'EMPTYSCHEMA.C1' on table 'APP.T1'.
+ERROR 42X86: ALTER TABLE failed. There is no constraint 'EMPTYSCHEMA.C1' on table 'APP.T1'. 
 ij> alter table t1 drop constraint nosuchschema.C2;
 ERROR 42Y07: Schema 'NOSUCHSCHEMA' does not exist
 ij> alter table t1 add constraint emptyschema.C1_PLUS_C2 check ((c1 + c2) < 100);
@@ -849,7 +849,7 @@
 ij> alter table APP.t1 drop constraint APP.C1_PLUS_C2;
 0 rows inserted/updated/deleted
 ij> execute alplus;
-ERROR 42X86: ALTER table failed. There is no constraint 'APP.C1_PLUS_C2' on table 'APP.T1'.
+ERROR 42X86: ALTER TABLE failed. There is no constraint 'APP.C1_PLUS_C2' on table 'APP.T1'. 
 ij> remove alplus;
 ij> drop table t1;
 0 rows inserted/updated/deleted

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/authorize.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/authorize.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/authorize.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/authorize.out Thu Jun  2 18:54:29 2005
@@ -251,9 +251,9 @@
 ij(C2)> insert into AUTH_TEST.t1 values 1,2;
 2 rows inserted/updated/deleted
 ij(C2)> readonly off;
-ERROR 25501: Unable to set the connection read only property in an active transaction.
+ERROR 25501: Unable to set the connection read-only property in an active transaction.
 ij(C2)> readonly on;
-ERROR 25501: Unable to set the connection read only property in an active transaction.
+ERROR 25501: Unable to set the connection read-only property in an active transaction.
 ij(C2)> rollback;
 ij(C2)> autocommit on;
 ij(C2)> --

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/autoincrement.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/autoincrement.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/autoincrement.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/autoincrement.out Thu Jun  2 18:54:29 2005
@@ -839,21 +839,21 @@
 -- pass in DB2 UDB
 -- fail in DB2 CS
 create table ni (x int, y int generated always as identity (increment by 0));
-ERROR 42Z21: Invalid increment specified for identity for column 'Y'. Increment must be non zero.
+ERROR 42Z21: Invalid increment specified for identity for column 'Y'. Increment cannot be zero.  
 ij> create table ni (x int, y int generated always as identity (start with 0, increment by 0));
-ERROR 42Z21: Invalid increment specified for identity for column 'Y'. Increment must be non zero.
+ERROR 42Z21: Invalid increment specified for identity for column 'Y'. Increment cannot be zero.  
 ij> create table ni (x int, y smallint generated always as identity (increment by 0));
-ERROR 42Z21: Invalid increment specified for identity for column 'Y'. Increment must be non zero.
+ERROR 42Z21: Invalid increment specified for identity for column 'Y'. Increment cannot be zero.  
 ij> create table ni (x int, y smallint generated always as identity (start with 0, increment by 0));
-ERROR 42Z21: Invalid increment specified for identity for column 'Y'. Increment must be non zero.
+ERROR 42Z21: Invalid increment specified for identity for column 'Y'. Increment cannot be zero.  
 ij> create table ni (x int, y int generated always as identity (increment by 0);
 ERROR 42X01: Syntax error: Encountered "<EOF>" at line 1, column 75.
 ij> create table ni (x int, y int generated always as identity (start with 0, increment by 0));
-ERROR 42Z21: Invalid increment specified for identity for column 'Y'. Increment must be non zero.
+ERROR 42Z21: Invalid increment specified for identity for column 'Y'. Increment cannot be zero.  
 ij> create table ni (x int, y bigint generated always as identity (increment by 0));
-ERROR 42Z21: Invalid increment specified for identity for column 'Y'. Increment must be non zero.
+ERROR 42Z21: Invalid increment specified for identity for column 'Y'. Increment cannot be zero.  
 ij> create table ni (x int, y bigint generated always as identity (start with 0, increment by 0));
-ERROR 42Z21: Invalid increment specified for identity for column 'Y'. Increment must be non zero.
+ERROR 42Z21: Invalid increment specified for identity for column 'Y'. Increment cannot be zero.  
 ij> -- out of range start 
 -- actually the first few are valid
 create table ni (x int, y int generated always as identity (start with 127, increment by -1));
@@ -1100,11 +1100,11 @@
 6          
 ij> -- should fail because alter table add generated column is not supported
 alter table base add column y smallint generated always as identity (start with  10);
-ERROR 42601: ALTER TABLE statement can not add an IDENTITY column to a table. 
+ERROR 42601: ALTER TABLE statement cannot add an IDENTITY column to a table.
 ij> alter table base add column y int generated always as identity (start with  10);
-ERROR 42601: ALTER TABLE statement can not add an IDENTITY column to a table. 
+ERROR 42601: ALTER TABLE statement cannot add an IDENTITY column to a table.
 ij> alter table base add column y bigint generated always as identity (start with  10);
-ERROR 42601: ALTER TABLE statement can not add an IDENTITY column to a table. 
+ERROR 42601: ALTER TABLE statement cannot add an IDENTITY column to a table.
 ij> -- make sure alter table failures above rolled themselves back 
 select * from base;
 X          

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out Thu Jun  2 18:54:29 2005
@@ -45,66 +45,66 @@
 clobTest12 finished
 START: clobTest2
 CLOB getSubString 9905 > 0
-EXPECTED SQLSTATE(XJ076): The position argument '9,905' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '9,905' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 5910 > 0
-EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 5910 > 0
-EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 204 > 0
-EXPECTED SQLSTATE(XJ076): The position argument '204' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '204' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 68 > 0
-EXPECTED SQLSTATE(XJ076): The position argument '68' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '68' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 1 > 0
-EXPECTED SQLSTATE(XJ076): The position argument '1' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '1' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 1 > 0
-EXPECTED SQLSTATE(XJ076): The position argument '1' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '1' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 9905 > 65
-EXPECTED SQLSTATE(XJ076): The position argument '9,905' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '9,905' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 5910 > 65
-EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 5910 > 65
-EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 204 > 65
-EXPECTED SQLSTATE(XJ076): The position argument '204' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '204' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 68 > 65
-EXPECTED SQLSTATE(XJ076): The position argument '68' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '68' exceeds the size of the BLOB/CLOB.
 2(5) (len 50) you can lead a horse to water but you can't form i
 2(6) (len 1) y
 CLOB getSubString 9905 > 26
-EXPECTED SQLSTATE(XJ076): The position argument '9,905' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '9,905' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 5910 > 26
-EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 5910 > 26
-EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 204 > 26
-EXPECTED SQLSTATE(XJ076): The position argument '204' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '204' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 68 > 26
-EXPECTED SQLSTATE(XJ076): The position argument '68' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '68' exceeds the size of the BLOB/CLOB.
 3(5) (len 50) a stitch in time says ouch
 3(6) (len 1) a
 CLOB getSubString 9905 > 42
-EXPECTED SQLSTATE(XJ076): The position argument '9,905' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '9,905' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 5910 > 42
-EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 5910 > 42
-EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 204 > 42
-EXPECTED SQLSTATE(XJ076): The position argument '204' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '204' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 68 > 42
-EXPECTED SQLSTATE(XJ076): The position argument '68' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '68' exceeds the size of the BLOB/CLOB.
 4(5) (len 50) here is a string with a return 
  character
 4(6) (len 1) h
 CLOB getSubString 9905 > 56
-EXPECTED SQLSTATE(XJ076): The position argument '9,905' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '9,905' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 5910 > 56
-EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 5910 > 56
-EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 204 > 56
-EXPECTED SQLSTATE(XJ076): The position argument '204' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '204' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 68 > 56
-EXPECTED SQLSTATE(XJ076): The position argument '68' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '68' exceeds the size of the BLOB/CLOB.
 5(5) (len 50) test data: a string column inserted as an Ascii st
 5(6) (len 1) t
 6(0) (len 50) wwPosition-9907-behold-the-end-of-the-clob-is-nigh
@@ -119,25 +119,25 @@
 6(7) 
 wwwwwwPosition-9907-behold-the-end-of-the-clob-is-nighwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww
 CLOB getSubString 9905 > 0
-EXPECTED SQLSTATE(XJ076): The position argument '9,905' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '9,905' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 5910 > 0
-EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 5910 > 0
-EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 204 > 0
-EXPECTED SQLSTATE(XJ076): The position argument '204' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '204' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 68 > 0
-EXPECTED SQLSTATE(XJ076): The position argument '68' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '68' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 1 > 0
-EXPECTED SQLSTATE(XJ076): The position argument '1' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '1' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 1 > 0
-EXPECTED SQLSTATE(XJ076): The position argument '1' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '1' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 9905 > 5000
-EXPECTED SQLSTATE(XJ076): The position argument '9,905' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '9,905' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 5910 > 5000
-EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the BLOB/CLOB.
 CLOB getSubString 5910 > 5000
-EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the BLOB/CLOB.
 8(3) (len 50) wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww
 8(4) (len 50) wwwwwwwwwwwwwwwwwwwwwwwwwwwwwww
 wwwwwwwwwwwwwwwww
@@ -422,12 +422,12 @@
 end clobTest54
 START: clobTest6
 EXPECTED SQLSTATE(XJ070): Negative or zero position argument '0' passed in a Blob or Clob method.
-EXPECTED SQLSTATE(XJ071): Zero or negative length argument '-76' passed in a Blob or Clob method.
-EXPECTED SQLSTATE(XJ071): Zero or negative length argument '0' passed in a Blob or Clob method.
+EXPECTED SQLSTATE(XJ071): Zero or negative length argument '-76' passed in a BLOB or CLOB method.
+EXPECTED SQLSTATE(XJ071): Zero or negative length argument '0' passed in a BLOB or CLOB method.
 EXPECTED SQLSTATE(XJ070): Negative or zero position argument '-4,000' passed in a Blob or Clob method.
-EXPECTED SQLSTATE(XJ072): Null pattern or searchStr passed in to a Blob or Clob position method.
+EXPECTED SQLSTATE(XJ072): Null pattern or searchStr passed in to a BLOB or CLOB position method.
 EXPECTED SQLSTATE(XJ070): Negative or zero position argument '-42' passed in a Blob or Clob method.
-EXPECTED SQLSTATE(XJ072): Null pattern or searchStr passed in to a Blob or Clob position method.
+EXPECTED SQLSTATE(XJ072): Null pattern or searchStr passed in to a BLOB or CLOB position method.
 clobTest6 finished
 START: clobTest7
 clobTest7 finished
@@ -519,15 +519,15 @@
 START: clobTest94
 shortClob length after commit is 26
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ073): The data in this Blob or Clob is no longer available. Possible reasons are that its transaction committed, or its connection closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ073): The data in this Blob or Clob is no longer available. Possible reasons are that its transaction committed, or its connection closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ073): The data in this Blob or Clob is no longer available. Possible reasons are that its transaction committed, or its connection closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ073): The data in this Blob or Clob is no longer available. Possible reasons are that its transaction committed, or its connection closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ073): The data in this Blob or Clob is no longer available. Possible reasons are that its transaction committed, or its connection closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
 clobTest94 finished
 START: clobTest95
 shortClob length after closing connection is 26
@@ -538,7 +538,7 @@
 FAIL -- unexpected exception ****************
 SQLSTATE(08003): No current connection.
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ073): The data in this Blob or Clob is no longer available. Possible reasons are that its transaction committed, or its connection closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
 FAIL -- unexpected exception ****************
 SQLSTATE(08003): No current connection.
 clobTest95 finished
@@ -560,66 +560,66 @@
 blobTest0 finished
 START: blobTest2
 testing Blob.getBytes() with pos 9905 > 0
-EXPECTED SQLSTATE(XJ076): The position argument '9,905' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '9,905' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 5910 > 0
-EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 5910 > 0
-EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 204 > 0
-EXPECTED SQLSTATE(XJ076): The position argument '204' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '204' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 68 > 0
-EXPECTED SQLSTATE(XJ076): The position argument '68' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '68' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 1 > 0
-EXPECTED SQLSTATE(XJ076): The position argument '1' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '1' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 1 > 0
-EXPECTED SQLSTATE(XJ076): The position argument '1' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '1' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 9905 > 65
-EXPECTED SQLSTATE(XJ076): The position argument '9,905' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '9,905' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 5910 > 65
-EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 5910 > 65
-EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 204 > 65
-EXPECTED SQLSTATE(XJ076): The position argument '204' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '204' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 68 > 65
-EXPECTED SQLSTATE(XJ076): The position argument '68' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '68' exceeds the size of the BLOB/CLOB.
 2(5) you can lead a horse to water but you can't form i
 2(6) y
 testing Blob.getBytes() with pos 9905 > 26
-EXPECTED SQLSTATE(XJ076): The position argument '9,905' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '9,905' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 5910 > 26
-EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 5910 > 26
-EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 204 > 26
-EXPECTED SQLSTATE(XJ076): The position argument '204' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '204' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 68 > 26
-EXPECTED SQLSTATE(XJ076): The position argument '68' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '68' exceeds the size of the BLOB/CLOB.
 3(5) a stitch in time says ouch
 3(6) a
 testing Blob.getBytes() with pos 9905 > 42
-EXPECTED SQLSTATE(XJ076): The position argument '9,905' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '9,905' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 5910 > 42
-EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 5910 > 42
-EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 204 > 42
-EXPECTED SQLSTATE(XJ076): The position argument '204' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '204' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 68 > 42
-EXPECTED SQLSTATE(XJ076): The position argument '68' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '68' exceeds the size of the BLOB/CLOB.
 4(5) here is a string with a return 
  character
 4(6) h
 testing Blob.getBytes() with pos 9905 > 56
-EXPECTED SQLSTATE(XJ076): The position argument '9,905' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '9,905' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 5910 > 56
-EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 5910 > 56
-EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 204 > 56
-EXPECTED SQLSTATE(XJ076): The position argument '204' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '204' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 68 > 56
-EXPECTED SQLSTATE(XJ076): The position argument '68' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '68' exceeds the size of the BLOB/CLOB.
 5(5) test data: a string column inserted as an Ascii st
 5(6) t
 6(0) wwPosition-9907-behold-the-end-of-the-clob-is-nigh
@@ -634,25 +634,25 @@
 6(7) 
 wwwwwwPosition-9907-behold-the-end-of-the-clob-is-nighwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww
 testing Blob.getBytes() with pos 9905 > 0
-EXPECTED SQLSTATE(XJ076): The position argument '9,905' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '9,905' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 5910 > 0
-EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 5910 > 0
-EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 204 > 0
-EXPECTED SQLSTATE(XJ076): The position argument '204' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '204' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 68 > 0
-EXPECTED SQLSTATE(XJ076): The position argument '68' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '68' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 1 > 0
-EXPECTED SQLSTATE(XJ076): The position argument '1' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '1' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 1 > 0
-EXPECTED SQLSTATE(XJ076): The position argument '1' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '1' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 9905 > 5000
-EXPECTED SQLSTATE(XJ076): The position argument '9,905' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '9,905' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 5910 > 5000
-EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the BLOB/CLOB.
 testing Blob.getBytes() with pos 5910 > 5000
-EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the Blob/Clob.
+EXPECTED SQLSTATE(XJ076): The position argument '5,910' exceeds the size of the BLOB/CLOB.
 8(3) wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww
 8(4) wwwwwwwwwwwwwwwwwwwwwwwwwwwwwww
 wwwwwwwwwwwwwwwww
@@ -692,62 +692,62 @@
 blobTest3 finished
 START: blobTest4
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the Blob/Clob pattern using getBytes/getSubString.
+SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the BLOB/CLOB pattern using getBytes/getSubString.
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the Blob/Clob pattern using getBytes/getSubString.
+SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the BLOB/CLOB pattern using getBytes/getSubString.
 searchBlob row 13 skipped (too large)
 Found horse in row 2 at position 16
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the Blob/Clob pattern using getBytes/getSubString.
+SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the BLOB/CLOB pattern using getBytes/getSubString.
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the Blob/Clob pattern using getBytes/getSubString.
+SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the BLOB/CLOB pattern using getBytes/getSubString.
 searchBlob row 13 skipped (too large)
 Found ouch in row 3 at position 23
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the Blob/Clob pattern using getBytes/getSubString.
+SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the BLOB/CLOB pattern using getBytes/getSubString.
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the Blob/Clob pattern using getBytes/getSubString.
+SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the BLOB/CLOB pattern using getBytes/getSubString.
 searchBlob row 13 skipped (too large)
 Found 
  in row 4 at position 32
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the Blob/Clob pattern using getBytes/getSubString.
+SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the BLOB/CLOB pattern using getBytes/getSubString.
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the Blob/Clob pattern using getBytes/getSubString.
+SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the BLOB/CLOB pattern using getBytes/getSubString.
 searchBlob row 13 skipped (too large)
 Found 
  in row 5 at position 56
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the Blob/Clob pattern using getBytes/getSubString.
+SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the BLOB/CLOB pattern using getBytes/getSubString.
 Found test data: a string column inserted as an Ascii stream
  in row 5 at position 1
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the Blob/Clob pattern using getBytes/getSubString.
+SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the BLOB/CLOB pattern using getBytes/getSubString.
 searchBlob row 13 skipped (too large)
 Found 
  in row 6 at position 100
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the Blob/Clob pattern using getBytes/getSubString.
+SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the BLOB/CLOB pattern using getBytes/getSubString.
 Found Beginning in row 6 at position 1
 Found position-69 in row 6 at position 69
 Found I-am-hiding-here-at-position-5910 in row 6 at position 5910
 Found Position-9907 in row 6 at position 9907
 Found blob (row 10)  in row 6 at position 1
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the Blob/Clob pattern using getBytes/getSubString.
+SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the BLOB/CLOB pattern using getBytes/getSubString.
 Found blob (row 12)  in row 6 at position 301
 searchBlob row 13 skipped (too large)
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the Blob/Clob pattern using getBytes/getSubString.
+SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the BLOB/CLOB pattern using getBytes/getSubString.
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the Blob/Clob pattern using getBytes/getSubString.
+SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the BLOB/CLOB pattern using getBytes/getSubString.
 searchBlob row 13 skipped (too large)
 Found 
  in row 8 at position 100
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the Blob/Clob pattern using getBytes/getSubString.
+SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the BLOB/CLOB pattern using getBytes/getSubString.
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the Blob/Clob pattern using getBytes/getSubString.
+SQLSTATE(XJ077): Got an exception when trying to read the first byte/character of the BLOB/CLOB pattern using getBytes/getSubString.
 Found blob (row 12)  in row 8 at position 1
 searchBlob row 13 skipped (too large)
 testBlob row 9 skipped (too large)
@@ -764,12 +764,12 @@
 SQLSTATE(22005): An attempt was made to get a data value of type 'INTEGER' from a data value of type 'java.sql.Blob'.
 START: blobTest6
 EXPECTED SQLSTATE(XJ070): Negative or zero position argument '0' passed in a Blob or Clob method.
-EXPECTED SQLSTATE(XJ071): Zero or negative length argument '-76' passed in a Blob or Clob method.
-EXPECTED SQLSTATE(XJ071): Zero or negative length argument '0' passed in a Blob or Clob method.
+EXPECTED SQLSTATE(XJ071): Zero or negative length argument '-76' passed in a BLOB or CLOB method.
+EXPECTED SQLSTATE(XJ071): Zero or negative length argument '0' passed in a BLOB or CLOB method.
 EXPECTED SQLSTATE(XJ070): Negative or zero position argument '-4,000' passed in a Blob or Clob method.
-EXPECTED SQLSTATE(XJ072): Null pattern or searchStr passed in to a Blob or Clob position method.
+EXPECTED SQLSTATE(XJ072): Null pattern or searchStr passed in to a BLOB or CLOB position method.
 EXPECTED SQLSTATE(XJ070): Negative or zero position argument '-42' passed in a Blob or Clob method.
-EXPECTED SQLSTATE(XJ072): Null pattern or searchStr passed in to a Blob or Clob position method.
+EXPECTED SQLSTATE(XJ072): Null pattern or searchStr passed in to a BLOB or CLOB position method.
 blobTest6 finished
 START: blobTest7
 blobTest7 finished
@@ -793,28 +793,28 @@
 START: blobTest94
 shortBlob length after commit is 26
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ073): The data in this Blob or Clob is no longer available. Possible reasons are that its transaction committed, or its connection closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ073): The data in this Blob or Clob is no longer available. Possible reasons are that its transaction committed, or its connection closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ073): The data in this Blob or Clob is no longer available. Possible reasons are that its transaction committed, or its connection closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ073): The data in this Blob or Clob is no longer available. Possible reasons are that its transaction committed, or its connection closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ073): The data in this Blob or Clob is no longer available. Possible reasons are that its transaction committed, or its connection closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
 blobTest94 finished
 START: blobTest95
 shortBlob length after closing the connection is 26
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ073): The data in this Blob or Clob is no longer available. Possible reasons are that its transaction committed, or its connection closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ073): The data in this Blob or Clob is no longer available. Possible reasons are that its transaction committed, or its connection closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ073): The data in this Blob or Clob is no longer available. Possible reasons are that its transaction committed, or its connection closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ073): The data in this Blob or Clob is no longer available. Possible reasons are that its transaction committed, or its connection closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
 FAIL -- unexpected exception ****************
-SQLSTATE(XJ073): The data in this Blob or Clob is no longer available. Possible reasons are that its transaction committed, or its connection closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
 blobTest95 finished
 START: blobTest96
 blobTest96 finished
@@ -831,9 +831,9 @@
 EXPECTED IO Exception:ERROR 40XD0: Container has been closed
 START: clobNegativeTest_Derby265
 -----------------------------
-EXPECTED SQLSTATE(XJ073): The data in this Blob or Clob is no longer available. Possible reasons are that its transaction committed, or its connection closed.
+EXPECTED SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
 START: blobTestNegativeTest_Derby265
 -----------------------------
-EXPECTED SQLSTATE(XJ073): The data in this Blob or Clob is no longer available. Possible reasons are that its transaction committed, or its connection closed.
+EXPECTED SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
 FINISHED TEST blobclob :-)
 Test blobclob finished

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cast.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cast.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cast.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cast.out Thu Jun  2 18:54:29 2005
@@ -1301,7 +1301,7 @@
 1 row inserted/updated/deleted
 ij> -- bug 5421 - support db2 udb compatible built-in functions
 execute q7 using 'values REAL(4321.01234)';
-ERROR 42X80: VALUES clause must contain at least 1 element and all elements must be non-empty.
+ERROR 42X80: VALUES clause must contain at least one element. Empty elements are not allowed. 
 ij> execute q8 using 'values SMALLINT(12321)';
 1 row inserted/updated/deleted
 ij> execute q10 using 'values 123456.78';

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkConstraint.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkConstraint.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkConstraint.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkConstraint.out Thu Jun  2 18:54:29 2005
@@ -22,7 +22,7 @@
 ERROR 42X19: The WHERE or HAVING clause or CHECK CONSTRAINT definition is a 'INTEGER' expression.  It must be a BOOLEAN expression.
 ij> -- All column references are to target table
 create table neg1(c1 int check((c2 = 1)));
-ERROR 42X04: Column 'C2' is not in any table in the FROM list or it appears within a join specification and is outside the scope of the join specification or it appears in a HAVING clause and is not in the GROUP BY list.  If this is a CREATE or ALTER TABLE statement then 'C2' is not a column in the target table.
+ERROR 42X04: Column 'C2' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then 'C2' is not a column in the target table.
 ij> -- verify that a check constraint can't be used as an optimizer override
 create table t1(c1 int constraint asdf check(c1 = 1));
 0 rows inserted/updated/deleted

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkDataSource30.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkDataSource30.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkDataSource30.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkDataSource30.out Thu Jun  2 18:54:29 2005
@@ -756,8 +756,8 @@
 PREPAREDSTATEMENT(this one was created with default holdability after the global transaction was resumed. Check it's holdability) HOLDABILITY false
 CALLABLESTATEMENT(this one was created with default holdability after the global transaction was resumed. Check it's holdability) HOLDABILITY false
 X@3 id 3
-Expected SQLException ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
-Expected SQLException ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+Expected SQLException ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
+Expected SQLException ResultSet not open. Operation 'next' not permitted. Verify that autocommit is OFF.
 Set connection to hold 
 CONNECTION(held) HOLDABILITY true
 CONNECTION(xa) HOLDABILITY false

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/closed.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/closed.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/closed.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/closed.out Thu Jun  2 18:54:29 2005
@@ -2,8 +2,8 @@
 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 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.

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/coalesceTests.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/coalesceTests.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/coalesceTests.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/coalesceTests.out Thu Jun  2 18:54:29 2005
@@ -1,8 +1,8 @@
 TestA - some syntax testing for Coalesce/Value function
 TestAla - select coalesce from tA will give error because no arguments were supplied to the function
-expected exception Column 'COALESCE' is not in any table in the FROM list or it appears within a join specification and is outside the scope of the join specification or it appears in a HAVING clause and is not in the GROUP BY list.  If this is a CREATE or ALTER TABLE statement then 'COALESCE' is not a column in the target table.
+expected exception Column 'COALESCE' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then 'COALESCE' is not a column in the target table.
 TestAlb - select value from tA will give error because no arguments were supplied to the function
-expected exception Column 'VALUE' is not in any table in the FROM list or it appears within a join specification and is outside the scope of the join specification or it appears in a HAVING clause and is not in the GROUP BY list.  If this is a CREATE or ALTER TABLE statement then 'VALUE' is not a column in the target table.
+expected exception Column 'VALUE' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then 'VALUE' is not a column in the target table.
 TestA2a - select coalesce from tA will give error because no arguments were supplied inside the parentheses
 expected exception Syntax error: Encountered ")" at line 1, column 17.
 TestA2b - select value from tA will give error because no arguments were supplied inside the parentheses
@@ -12,9 +12,9 @@
 TestA3b - select value from tA with only one argument will give error
 expected exception The number of arguments for function 'VALUE' is incorrect.
 TestA4a - select coalesce from tA with incorrect column name will give error
-expected exception Column 'C111' is not in any table in the FROM list or it appears within a join specification and is outside the scope of the join specification or it appears in a HAVING clause and is not in the GROUP BY list.  If this is a CREATE or ALTER TABLE statement then 'C111' is not a column in the target table.
+expected exception Column 'C111' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then 'C111' is not a column in the target table.
 TestA4b - select value from tA with incorrect column name will give error
-expected exception Column 'C111' is not in any table in the FROM list or it appears within a join specification and is outside the scope of the join specification or it appears in a HAVING clause and is not in the GROUP BY list.  If this is a CREATE or ALTER TABLE statement then 'C111' is not a column in the target table.
+expected exception Column 'C111' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then 'C111' is not a column in the target table.
 TestA5a - create table with table name as coalesce and column name as coalesce will pass because coalesce is not a reserved-word
 	 COL1(datatype : INTEGER, precision : 10, scale : 0)
 	 ---------------------------------------------------
@@ -26,9 +26,9 @@
 	{null}
 	{1}
 TestA6a - All arguments to coalesce function passed as parameters is an error
-expected exception All the arguments to the COALESC/VALUE function can not be parameters. Need to have at least one non-parameter argument.
+expected exception All the arguments to the COALESCE/VALUE function cannot be parameters. The function needs at least one argument that is not a parameter.
 TestA6b - All arguments to value function passed as parameters is an error
-expected exception All the arguments to the COALESC/VALUE function can not be parameters. Need to have at least one non-parameter argument.
+expected exception All the arguments to the COALESCE/VALUE function cannot be parameters. The function needs at least one argument that is not a parameter.
 Set up by creating table for testing all datatypes combinations
 create table AllDataTypesTable (SMALLINTCOL SMALLINT,INTEGERCOL INTEGER,BIGINTCOL BIGINT,DECIMALCOL DECIMAL(10,5),REALCOL REAL,DOUBLECOL DOUBLE,CHARCOL CHAR(60),VARCHARCOL VARCHAR(60),LONGVARCHARCOL LONG VARCHAR,CHARFORBITCOL CHAR(60) FOR BIT DATA,VARCHARFORBITCOL VARCHAR(60) FOR BIT DATA,LVARCHARFORBITCOL LONG VARCHAR FOR BIT DATA,CLOBCOL CLOB(1k),DATECOL DATE,TIMECOL TIME,TIMESTAMPCOL TIMESTAMP,BLOBCOL BLOB(1k))
 insert into AllDataTypesTable values(NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL)

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/compressTable.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/compressTable.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/compressTable.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/compressTable.out Thu Jun  2 18:54:29 2005
@@ -905,7 +905,7 @@
 4          |4          
 ij> -- read every row and value in the table, including overflow pages.
 insert into xena values (select a + 4, b - 4, c, d from xena);
-ERROR 42X80: VALUES clause must contain at least 1 element and all elements must be non-empty.
+ERROR 42X80: VALUES clause must contain at least one element. Empty elements are not allowed. 
 ij> insert into xena values (select (a + 4, b - 4, c, d from xena);
 ERROR 42X01: Syntax error: Encountered "," at line 1, column 39.
 ij> select 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/currentof.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/currentof.out?rev=179696&r1=179695&r2=179696&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/currentof.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/currentof.out Thu Jun  2 18:54:29 2005
@@ -48,7 +48,7 @@
 Row: 180,rubber ducky                                      
 Row: 3,you are the one                                   
 Have 4 rows in table at start
-ERROR 42X31: Column 'C' is not in FOR UPDATE list of cursor 'SQLCUR1'.
+ERROR 42X31: Column 'C' is not in the FOR UPDATE list of cursor 'SQLCUR1'.
 PASS: update of non-existant column caught
 PASS: update of read-only cursor caught
 PASS: update of fetch-only cursor caught
@@ -57,7 +57,7 @@
 PASS: update of derived table cursor caught
 PASS: update of values clause cursor caught
 PASS: update of subquery cursor caught
-ERROR 42X29: Update table 'S' is not target of cursor 'SQLCUR2'.
+ERROR 42X29: Update table 'S' is not the target of cursor 'SQLCUR2'.
 PASS: update table and cursor table mismatch caught
 ERROR XCL08: Cursor 'SQLCUR2' is not on a row.
 PASS: Attempt to update cursor before first row caught
@@ -90,7 +90,7 @@
 PASS: expected and got 1 rowon stmt: update: valid update
 PASS: expected and got true
 Row: 1986,Dan was here                                      
-ERROR 42X31: Column 'C' is not in FOR UPDATE list of cursor 'CS4395'.
+ERROR 42X31: Column 'C' is not in the FOR UPDATE list of cursor 'CS4395'.
 PASS: Attempt to update changed invalid cursor caught
 PASS: expected and got true
 Row: 1986,Dan was here                                      
@@ -100,7 +100,7 @@
 PASS: expected and got 1 rowon stmt: update: valid update
 PASS: expected and got true
 Row: 1996,Dan was here                                      
-ERROR 42X31: Column 'C' is not in FOR UPDATE list of cursor 'SQLCUR3'.
+ERROR 42X31: Column 'C' is not in the FOR UPDATE list of cursor 'SQLCUR3'.
 PASS: Attempt to update changed invalid cursor caught
 PASS: expected and got true
 Row: 1996,Dan was here                                      



Mime
View raw message