db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r178809 - in /incubator/derby/code/trunk/java: engine/org/apache/derby/loc/ testing/org/apache/derbyTesting/functionTests/master/
Date Fri, 27 May 2005 18:42:23 GMT
Author: fuzzylogic
Date: Fri May 27 11:42:22 2005
New Revision: 178809

URL: http://svn.apache.org/viewcvs?rev=178809&view=rev
Log:
Derby-305: Fix error messages in properties files to match text in
documentation.

Committed for David Van Couvering <David.Vancouvering@sun.com>

Modified:
    incubator/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml112.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml147.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/procedure.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schema5.out

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties?rev=178809&r1=178808&r2=178809&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties (original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties Fri May 27 11:42:22 2005
@@ -6,32 +6,32 @@
 ###############################################################################
 
 # Monitor
-XBM01.D=Startup failed due to an exception, see next exception for details.
+XBM01.D=Startup failed due to an exception. See next exception for details. 
 XBM02.D=Startup failed due to missing functionality for {0}. Please ensure your classpath includes the correct Derby software.
 XBM05.D=Startup failed due to missing product version information for {0}.
-XBM06.D=Startup failed, an encrypted database cannot be accessed without the correct boot password.
-XBM07.D=Startup failed, boot password must be at least 8 bytes long.
+XBM06.D=Startup failed. An encrypted database cannot be accessed without the correct boot password.  
+XBM07.D=Startup failed. Boot password must be at least 8 bytes long.
 XBM08.D=Could not instantiage {0} StorageFactory class {1}.
 
-XBM0G.D=Failed to start encryption engine. Please make sure you are running Java 2 and have downloaded an encryption provider such as jce and put it in your classpath.
+XBM0G.D=Failed to start encryption engine. Please make sure you are running Java 2 and have downloaded an encryption provider such as jce and put it in your class path. 
 XBM0H.D=Directory {0} cannot be created.
 XBM0I.D=Directory {0} cannot be removed.
 XBM0J.D=Directory {0} already exists.
 XBM0K.D=Unknown sub-protocol for database name {0}.
 XBM0L.D=Specified authentication scheme class {0} does implement the authentication interface {1}.
 XBM0M.D=Error creating instance of authentication scheme class {0}.
-XBM0N.D=JDBC Driver registration with java.sql.DriverManager failed, see next exception for details.
-XBM0P.D=Service provider is read-only, operation not permitted.
+XBM0N.D=JDBC Driver registration with java.sql.DriverManager failed. See next exception for details. 
+XBM0P.D=Service provider is read-only. Operation not permitted. 
 XBM0S.D=Unable to rename file ''{0}'' to ''{1}''
-XBM0T.D=Ambigious sub-protocol for database name {0}.
-XBM0U.S=No class was registered for identifier {0}
-XBM0V.S=An exception was thrown while loading class {1} registered for identifier {0}
-XBM0W.S=An exception was thrown while creating an instance of class {1} registered for identifier {0}
+XBM0T.D=Ambiguous sub-protocol for database name {0}.   
+XBM0U.S=No class was registered for identifier {0}.
+XBM0V.S=An exception was thrown while loading class {1} registered for identifier {0}.
+XBM0W.S=An exception was thrown while creating an instance of class {1} registered for identifier {0}.
 XBM0X.D=Supplied territory description ''{0}'' is invalid, expecting ln[_CO[_variant]]\nln=lower-case two-letter ISO-639 language code, CO=upper-case two-letter ISO-3166 country codes, see java.util.Locale.
 XBM0Y.D=Backup database directory {0} not found. Please make sure that the specified backup path is right.
 XBM0Z.D=Unable to copy file ''{0}'' to ''{1}''. Please make sure that there is enough space and permissions are correct. 
 XBM0Q.D=File {0} not found. Please make sure that backup copy is the correct one and it is not corrupted.
-XBM0R.D=Unable to remove File {0}.
+XBM0R.D=Unable to remove File {0}.  
 
 # Upgrade
 XCW00.D=Unsupported upgrade from ''{0}'' to ''{1}''.
@@ -43,7 +43,7 @@
 08000=Connection closed by unknown interrupt.
 
 #../java/com/ibm/db2j/protocol/BasicServices/LockManager/messages.properties
-40001=A lock could not be obtained due to a deadlock, cycle of locks & waiters is:\n{0}The selected victim is XID : {1}
+40001=A lock could not be obtained due to a deadlock, cycle of locks and waiters is:\n{0}. The selected victim is XID : {1}.
 
 40XL1=A lock could not be obtained within the time requested
 40XL2=A lock could not be obtained within the time requested.  The lockTable dump is: {0}
@@ -60,14 +60,14 @@
 XCY03.S=Required property ''{0}'' has not been set.
 
 # Cryptography
-XBCX0.S=Exception from Cryptography provider, see next exception for details.
+XBCX0.S=Exception from Cryptography provider. See next exception for details.
 XBCX1.S=Initializing cipher with illegal mode, must be either ENCRYPT or DECRYPT.
-XBCX2.S=Initializing cipher with a boot password that is too short, must be at least {0} characters long
+XBCX2.S=Initializing cipher with a boot password that is too short. The password must be at least {0} characters long.    
 XBCX5.S=Cannot change boot password to null.
 XBCX6.S=Cannot change boot password to a non-string serializable type.
 XBCX7.S=Wrong format for changing boot password.  Format must be : old_boot_password, new_boot_password.
 XBCX8.S=Cannot change boot password for a non-encrypted database.
-XBCX9.S=Cannot change boot password for a read only database.
+XBCX9.S=Cannot change boot password for a read-only database.  
 XBCXA.S=Wrong boot password.
 XBCXB.S=Bad encryption padding ''{0}'' or padding not specified. ''NoPadding'' must be used.
 XBCXC.S=Encryption algorithm ''{0}'' does not exist. Please check that the chosen provider ''{1}'' supports this algorithm.
@@ -77,16 +77,16 @@
 XBCXG.S=The encryption provider ''{0}'' does not exist.
 XBCXH.S=The encryptionAlgorithm ''{0}'' is not in the correct format. The correct format is algorithm/feedbackMode/NoPadding.
 XBCXI.S=The feedback mode ''{0}'' is not supported. Supported feedback modes are CBC, CFB, OFB and ECB.
-XBCXJ.S=The application is using a version of the Java Cryptography Extension (JCE) earlier than 1.2.1.  Please upgrade to JCE 1.2.1 and re-try the operation.
-XBCXK.S=The given encryption key does not match the encryption key used when creating the database. Please ensure that you are using the correct encryption key and re-try. 
-XBCXL.S=The verification process for the encryption key was not successful, see next exception for details. Possible causes can be an error when accessing the appropriate file to do the verification process.
+XBCXJ.S=The application is using a version of the Java Cryptography Extension (JCE) earlier than 1.2.1.  Please upgrade to JCE 1.2.1 and try the operation again.    
+XBCXK.S=The given encryption key does not match the encryption key used when creating the database. Please ensure that you are using the correct encryption key and try again. 
+XBCXL.S=The verification process for the encryption key was not successful. This could have been caused by an error when accessing the appropriate file to do the verification process.  See next exception for details.  
 
 #../java/com/ibm/db2j/impl/BasicServices/CacheService/Generic/messages.properties
 
 # CacheStatementException messages
 # sqlstate range: XBCA0 to XBCAZ
 
-XBCA0.S=Cannot create new object with key {1} in {0} cache, it already exist in the cache.
+XBCA0.S=Cannot create new object with key {1} in {0} cache. The object already exists in the cache. 
 
 
 # java/com/ibm/db2j/protocol/Database/Storage/Access/Interface.
@@ -244,7 +244,7 @@
 40XT0=An internal error was identified by RawStore module.
 40XT1=An exception was thrown during transaction commit.
 40XT2=An exception was thrown during rollback of a SAVEPOINT.
-40XT4=An attempt was made to close a transaction that was still active, transaction has been aborted.
+40XT4=An attempt was made to close a transaction that was still active. The transaction has been aborted.
 40XT5=Exception thrown during an internal transaction.
 40XT6=Database is in quiescent state, cannot activate transaction.  Please wait for a moment till it exits the quiescent state.
 40XT7=Operation is not supported in an internal transaction.
@@ -274,8 +274,8 @@
 # transaction errors.
 # sqlstate range: 40XD0 to 40XDZ
 40XD0=Container has been closed
-40XD1=Container was opened in read only mode
-40XD2=Container {0} cannot be opened, either it has been dropped or is non-existant
+40XD1=Container was opened in read-only mode.   
+40XD2=Container {0} cannot be opened; it either has been dropped or does not exist.
 
 
 # java/com/ibm/db2j/impl/Database/Storage/RawStore/Data/Generic
@@ -352,7 +352,7 @@
 01504=The new index is a duplicate of an existing index: {0}.
 01505=The value {0} may be truncated.
 01003=Null values were eliminated from the argument of a column function.
-0100E=XX Attepmt to return too many result sets
+0100E=XX Attempt to return too many result sets. 
 02000=No row was found for FETCH, UPDATE or DELETE; or the result of a query is an empty table.
 21000=Scalar subquery is only allowed to return a single row.
 22001=A truncation error was encountered trying to shrink {0} ''{1}'' to length {2}.
@@ -365,10 +365,10 @@
 22011=The second or third argument of the SUBSTR function is out of range.
 22012=Attempt to divide by zero.
 22013=Attempt to take the square root of a negative number, ''{0}''.
-22014=The start positon for LOCATE is invalid; it must be a positive integer.  The index to start the search from is ''{2}''.  The string to search for is ''{0}''.  The string to search from is ''{1}''. 
+22014=The start position for LOCATE is invalid; it must be a positive integer. The index  to start the search from is ''{2}''.  The string to search for is ''{0}''.  The string to search from is ''{1}''. 
 22015=The ''{0}'' function is not allowed on the following set of types.  First operand is of type ''{1}''.  Second operand is of type ''{2}''.  Third operand (start position) is of type ''{3}''.
 22018=Invalid character string format for type {0}.
-22019=Invalid escape sequence, ''{0}''. The escape string must be exactly one character. It can not be a null or more than one character.
+22019=Invalid escape sequence, ''{0}''. The escape string must be exactly one character. It cannot be a null or more than one character.
 22025=Escape character must be followed by escape character, '_', or '%'. It cannot be followed by any other character or be at the end of the pattern.
 22027=The built-in TRIM() function only supports a single trim character.  The LTRIM() and RTRIM() built-in functions support multiple trim characters.
 22501=An ESCAPE clause of NULL returns undefined results and is not allowed.
@@ -387,13 +387,13 @@
 
 # DB2 error for max length violation by char, varchar and long varchar. In future, this error message will be used for other purposes too
 42601=In an ALTER TABLE statement, the column ''{0}'' has been specified as NOT NULL and either the DEFAULT clause was not specified or was specified as DEFAULT NULL.
-42601.S.372=ALTER TABLE statement can not add an IDENTITY column to a table. 
+42601.S.372=ALTER TABLE statement cannot add an IDENTITY column to a table.
 42606=An invalid hexadecimal constant starting with ''{0}'' has been detected.
 54002=A string constant starting with ''{0}'' is too long.
 42611=The length, precision, or scale attribute for column, or type mapping ''{0}'' is not valid. 
 
 42605=The number of arguments for function ''{0}'' is incorrect.
-42610=All the arguments to the COALESC/VALUE function can not be parameters. Need to have at least one non-parameter argument.
+42610=All the arguments to the COALESCE/VALUE function cannot be parameters. The function needs at least one argument that is not a parameter.
 
 42613=Multiple or conflicting keywords involving the ''{0}'' clause are present.
 42621=A check constraint or generated column that is defined with ''{0}'' is invalid.
@@ -417,22 +417,22 @@
 42X01=Syntax error: {0}.
 42X02={0}.
 42X03=Column name ''{0}'' is in more than one table in the FROM list.
-42X04=Column ''{0}'' 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 ''{0}'' is not a column in the target table.
+42X04=Column ''{0}'' 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 ''{0}'' is not a column in the target table.
 42X05=Table ''{0}'' does not exist.
 42X06=Too many result columns specified for table ''{0}''.
 42X07=Null is only allowed in a VALUES clause within an INSERT statement.
-42X08=The constructor for class ''{0}'' cannot be used as an external virtual table as the class does not implement ''{1}''
+42X08=The constructor for class ''{0}'' cannot be used as an external virtual table because the class does not implement ''{1}''. 
 42X09=The table or alias name ''{0}'' is used more than once in the FROM list.
 42X10=''{0}'' is not an exposed table name in the scope in which it appears.
 42622=The name ''{0}'' is too long. The maximum length is ''{1}''.
-42X12=Column name ''{0}'' appears more than once in the create table statement.
+42X12=Column name ''{0}'' appears more than once in the CREATE TABLE statement.  
 54011=Too many columns ({0}) were specified for  table or view {1}. The limit is {2}.
-42Z9F=Too many indexes ({0}) on the table {1}. the limit is {2}.
-42X13=Column name ''{0}'' appears more than once times in the column list of an insert statement.
+42Z9F=Too many indexes ({0}) on the table {1}. The limit is {2}.  
+42X13=Column name ''{0}'' appears more than once times in the column list of an INSERT statement. 
 42X14=''{0}'' is not a column in table or VTI ''{1}''.
 42X15=Column name ''{0}'' appears in a statement without a FROM list.
-42X16=Column name ''{0}'' appears multiple times in the SET clause of an update statement.
-42X17=The value ''{0}'' is not valid as a joinOrder specification in the Properties list of a FROM clause. Only the values FIXED and UNFIXED are valid.
+42X16=Column name ''{0}'' appears multiple times in the SET clause of an UPDATE statement.
+42X17=In the Properties list of a FROM clause, the value ''{0}'' is not valid as a joinOrder specification. Only the values FIXED and UNFIXED are valid.  
 42803=An expression containing the column ''{0}'' appears in the SELECT list and is not part of a GROUP BY clause.
 42818=Comparisons between ''{0}'' and ''{1}'' are not supported.
 42X19=The WHERE or HAVING clause or CHECK CONSTRAINT definition is a ''{0}'' expression.  It must be a BOOLEAN expression.
@@ -441,9 +441,9 @@
 42X25=The ''{0}'' function is not allowed on the ''{1}'' type.
 42X26=The class ''{0}'' for column ''{1}'' does not exist or is inaccessible. This can happen if the class is not public.
 42X28=Delete table ''{0}'' is not target of cursor ''{1}''.
-42X29=Update table ''{0}'' is not target of cursor ''{1}''.
+42X29=Update table ''{0}'' is not the target of cursor ''{1}''.
 42X30=Cursor ''{0}'' not found. Verify that autocommit is OFF.
-42X31=Column ''{0}'' is not in FOR UPDATE list of cursor ''{1}''.
+42X31=Column ''{0}'' is not in the FOR UPDATE list of cursor ''{1}''.
 42X42=Correlation name not allowed for column ''{0}'' because it is part of the FOR UPDATE list.
 42X32=The number of columns in the derived column list must match the number of columns in table ''{0}''.
 42X33=The derived column list contains a duplicate column name ''{0}''.
@@ -453,36 +453,36 @@
 42X37=The unary ''{0}'' operator is not allowed on the ''{1}'' type.
 42X38=''SELECT *'' only allowed in EXISTS and NOT EXISTS subqueries.
 42X39=Subquery is only allowed to return a single column.
-42X40=A NOT has a non-Boolean operand. The operand of NOT must evaluate to TRUE, FALSE, or UNKNOWN.
-42X41=The property ''{0}'' is not valid in the Properties clause of a FROM list (the property was being set to ''{1}'').
+42X40=A NOT statement has an operand that is not boolean . The operand of NOT must evaluate to TRUE, FALSE, or UNKNOWN. 
+42X41=In the Properties clause of a FROM list, the property ''{0}'' is not valid (the property was being set to ''{1}''). 
 42821=Columns of type ''{0}'' cannot hold values of type ''{1}''. 
-42X43=The ResultSetMetaData returned for the class/object ''{0}'' was null. The ResultSetMetaData must be non-null in order to use this class as an external virtual table.
+42X43=The ResultSetMetaData returned for the class/object ''{0}'' was null. In order to use this class as an external virtual table, the ResultSetMetaData cannot be null. 
 42X44=Invalid length ''{0}'' in column specification.
 42X45={0} is an invalid type for argument number {1} of {2}.
 # 42X46=
 # 42X47=
 42X48=Value ''{1}'' is not a valid precision for {0}.
 42X49=Value ''{0}'' is not a valid integer literal.
-42X50=No method was found to be able to match method call {0}.{1}({2}), 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.
+42X50=No method was found that matched the method call {0}.{1}({2}), 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.
 42X51=The class ''{0}'' does not exist or is inaccessible. This can happen if the class is not public.
 42X52=Calling  method (''{0}'') using a receiver of the Java primitive type ''{1}" is not allowed.
 42X53=The LIKE predicate can only have ''CHAR'' or ''VARCHAR'' operands. Type ''{0}'' is not permitted.
 42X54=The Java method ''{0}'' has a ? as a receiver.  This is not allowed.
 42X55=Table name ''{1}'' should be the same as ''{0}''.
 42X56=The number of columns in the view column list does not match the number of columns in the underlying query expression in the view definition for ''{0}''.
-42X57=The getColumnCount() for external virtual table ''{0}'' returned an invalid value ''{1}''.  Valid values are >= 1.
+42X57=The getColumnCount() for external virtual table ''{0}'' returned an invalid value ''{1}''.  Valid values are greater than or equal to 1. 
 42X58=The number of columns on the left and right sides of the {0} must be the same.
 42X59=The number of columns in each VALUES constructor must be the same.
 42X60=Invalid value ''{0}'' for insertMode property specified for table ''{1}''.
 42X61=Types ''{0}'' and ''{1}'' are not {2} compatible.
 42X62=''{0}'' is not allowed in the ''{1}'' schema.
-42X63=The USING clause did not return any results, no parameters can be set.
-42X64=Invalid value ''{0}'' specified for useStatistics property in the Properties list. TRUE or FALSE are the only valid values.
+42X63=The USING clause did not return any results. No parameters can be set. 
+42X64=In the Properties list, the invalid value ''{0}'' was specified for the useStatistics property. The only valid values are TRUE or FALSE. 
 42X65=Index ''{0}'' does not exist.
-42X66=Column name ''{0}'' appears more than once in the create index statement.
+42X66=Column name ''{0}'' appears more than once in the CREATE INDEX statement.
 42X68=No field ''{0}'' was found belonging to class ''{1}''.  It may be that the field exists, but it is not public, or that the class does not exist or is not public.
 42X69=It is not allowed to reference a field (''{0}'') using a referencing expresssion of the Java primitive type ''{1}''.
-42X72=No static field ''{0}'' was found belonging to class ''{1}''.  It may be that the field exists, but it is not public and/or static, or that the class does not exist or is not public.
+42X72=No static field ''{0}'' was found belonging to class ''{1}''.  The field might exist, but it is not public and/or static, or the class does not exist or the class is not public.  
 42X73=Method resolution for signature {0}.{1}({2}) was ambiguous. (No single maximally specific method.)
 42X74=Invalid CALL statement syntax.
 42X75=No constructor was found with the signature {0}({1}).  It may be that the parameter types are not method invocation convertible.
@@ -491,21 +491,21 @@
 42X78=Column ''{0}'' is not in the result of the query expression.
 42X79=Column name ''{0}'' appears more than once in the result of the query expression.
 42877=A qualified column name ''{0}'' is not allowed in the ORDER BY clause.
-42X80=VALUES clause must contain at least 1 element and all elements must be non-empty.
-42X82=The USING clause returned more than one row, only single row ResultSets are permissable.
-42X83=The constraints on column ''{0}'' requires that it be both nullable and not nullable.
+42X80=VALUES clause must contain at least one element. Empty elements are not allowed. 
+42X82=The USING clause returned more than one row. Only single-row ResultSets are permissable.
+42X83=The constraints on column ''{0}'' require that it be both nullable and not nullable.
 42X84=Index ''{0}'' was created to enforce constraint ''{1}''.  It can only be dropped by dropping the constraint.
 42X85=Constraint ''{0}''is required to be in the same schema as table ''{1}''.
-42X86=ALTER table failed. There is no constraint ''{0}'' on table ''{1}''.
-42X87=At least one result expression (then or else) of the ''{0}'' expression must not be a ''?''.
-42X88=A Conditional has a non-Boolean operand. The operand of Conditional must evaluate to TRUE, FALSE, or UNKNOWN.
-42X89=Types ''{0}'' and ''{1}'' are not type compatible. (Neither type is assignable to the other type.)
-42X90=More than 1 primary key constraint specified for table ''{0}''.
-42X91=Constraint name ''{0}'' appears more than once in the create table statement.
+42X86=ALTER TABLE failed. There is no constraint ''{0}'' on table ''{1}''. 
+42X87=At least one result expression (THEN or ELSE) of the ''{0}'' expression must not be a ''?''. 
+42X88=A conditional has a non-Boolean operand. The operand of a conditional must evaluate to TRUE, FALSE, or UNKNOWN.  
+42X89=Types ''{0}'' and ''{1}'' are not type compatible. Neither type is assignable to the other type.  
+42X90=More than one primary key constraint specified for table ''{0}''.
+42X91=Constraint name ''{0}'' appears more than once in the CREATE TABLE statement. 
 42X92=Column name ''{0}'' appears more than once in a constraint''s column list.
 42X93=Table ''{0}'' contains a constraint definition with column ''{1}'' which is not in the table.
-42Z93=Constraints ''{0}'' and ''{1}'' have same set of columns, which is not allowed.
-42Z9B=The external virtual table interface does not support blob or clob columns. ''{0}'' column ''{1}''.
+42Z93=Constraints ''{0}'' and ''{1}'' have the same set of columns, which is not allowed. 
+42Z9B=The external virtual table interface does not support BLOB or CLOB columns. ''{0}'' column ''{1}''. 
 42Z9D=''{0}'' statements are not allowed in ''{1}'' triggers.
 42Z9E=Constraint ''{0}'' is not a {1} constraint.
 42X94={0} ''{1}'' does not exist.
@@ -516,7 +516,7 @@
 42Y03=''{0}'' is not recognized as a function or procedure.
 
 # EXTERNAL NAME is SQL keyword - do not translate
-42Y04=Cannot create a procedure or function with EXTERNAL NAME ''{0}'' because it is not a dot separated list. The expected format is <full java path>.<method name> .
+42Y04=Cannot create a procedure or function with EXTERNAL NAME ''{0}'' because it is not a list separated by periods. The expected format is <full java path>.<method name>.
 
 42Y05=There is no Foreign Key named ''{0}''.
 42Y07=Schema ''{0}'' does not exist
@@ -525,25 +525,25 @@
 42Y10=A table constructor that is not in an INSERT statement has all ? parameters in one of its columns.  For each column, at least one of the rows must have a non-parameter.
 42Y11=A join specification is required with the ''{0}'' clause.
 42Y12=The ON clause of a JOIN is a ''{0}'' expression.  It must be a BOOLEAN expression.
-42Y13=Column name ''{0}'' appears more than once in the create view statement.
+42Y13=Column name ''{0}'' appears more than once in the CREATE VIEW statement.
 42Z97=Renaming column ''{0}'' will cause check constraint ''{1}'' to break.
 42Z99=String or Hex literal cannot exceed 64K.
-42Y16=No public static method ''{0}'' was found in class ''{1}''.  It may be that the method exists, but it is not public, or not static.
+42Y16=No public static method ''{0}'' was found in class ''{1}''. The method might exist, but it is not public, or it is not static. 
 42846=Cannot convert types ''{0}'' to ''{1}''.
 42Y19=''{0}'' appears multiple times in the GROUP BY list. Columns in the GROUP BY list must be unambiguous.
 42Y22=Aggregate {0} cannot operate on type {1}.
 42Y23=Incorrect JDBC type info returned for column {0}.
-42Y24=View ''{0}'' is not updatable. (Views are currently not updateable.)
+42Y24=View ''{0}'' is not updatable. (Views are currently not updatable.) 
 42Y25=''{0}'' is a system table.  Users are not allowed to modify the contents of this table.
 #42Y26=Parameters are not allowed in the WHEN clause of a trigger.
 42Y27=Parameters are not allowed in the trigger action.
-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.
-42Y30=The SELECT list of a grouped query contains at least 1 invalid expression.  For a SELECT with a GROUP BY, the SELECT list may only contain grouping columns and valid aggregate expressions.
+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.
+42Y30=The SELECT list of a grouped query contains at least one invalid expression. If a SELECT list has a GROUP BY, the list may only contain grouping columns and valid aggregate expressions.  
 42Y32=Aggregator class ''{0}'' for aggregate ''{1}'' on type {2} does not implement com.ibm.db2j.aggregates.Aggregator. 
 42Y33=Aggregate {0} contains one or more aggregates.
 42Y34=Column name ''{0}'' matches more than one result column in table ''{1}''.
-42Y35=Column reference ''{0}'' is invalid. When the SELECT list contains at least 1 aggregate then all entries must be valid aggregate expressions.
-42Y36=Column reference ''{0}'' is invalid.  For a SELECT with a GROUP BY, the SELECT list may only contain grouping columns and valid aggregate expressions.
+42Y35=Column reference ''{0}'' is invalid. When the SELECT list contains at least one aggregate then all entries must be valid aggregate expressions.  
+42Y36=Column reference ''{0}'' is invalid.  For a SELECT list with a GROUP BY, the list may only contain grouping columns and valid aggregate expressions.  
 42Y37=''{0}'' is a Java primitive and cannot be used with this operator.
 42Y38=insertMode = replace is not permitted on an insert where the target table, ''{0}'', is referenced in the SELECT.
 # NOTE: The parameter to this message is a keyword used as a noun phrase.
@@ -553,38 +553,38 @@
 42Y41=''{0}'' cannot be directly invoked via EXECUTE STATEMENT because it is part of a trigger.
 42Y42=Scale ''{1}'' is not a valid scale for a {0}.
 42Y43=Scale ''{0}'' is not a valid scale with precision of ''{1}''.
-42Y44=Invalid key, ''{0}'', specified in Properties list in FROM list. The currently supported case-sensitive keys are ''{1}''.
+42Y44=Invalid key ''{0}'' specified in the Properties list of a FROM list. The case-sensitive keys that are currently supported are ''{1}''. 
 42Y45=VTI ''{0}'' cannot be bound because it is a special trigger VTI and this statement is not part of a trigger action or WHEN clause.
 42Y46=Invalid Properties list in FROM list.  There is no index ''{0}'' on table ''{1}''.
 42Y48=Invalid Properties list in FROM list.  Either there is no named constraint ''{0}'' on table ''{1}'' or the constraint does not have a backing index.
 42Y49=Multiple values specified for property key ''{0}''. 
 42Y50=Properties list for table ''{0}'' may contain values for index or for constraint but not both.
 42Y55=''{0}'' cannot be performed on ''{1}'' because it does not exist.
-42Y56=Invalid joinStrategy, ''{0}'', specified in Properties list on table ''{1}''. The currently supported values for joinStrategy are ''hash'', ''nestedloop''.
+42Y56=Invalid join strategy ''{0}'' specified in Properties list on table ''{1}''. The currently supported values for a join strategy are: ''hash'' and ''nestedloop''.
 42Y58=NumberFormatException occurred when converting value ''{0}'' for optimizer override ''{1}''.
-42Y59=Invalid value, ''{0}'', specified for hashInitialCapacity override. Value must be > 0.
-42Y60=Invalid value, ''{0}'', specified for hashLoadFactor override. Value must be > 0.0 and <= 1.0.
-42Y61=Invalid value, ''{0}'', specified for hashMaxCapacity override. Value must be > 0.
+42Y59=Invalid value, ''{0}'', specified for hashInitialCapacity override. Value must be greater than 0.
+42Y60=Invalid value, ''{0}'', specified for hashLoadFactor override. Value must be greater than 0.0 and less than or equal to 1.0.
+42Y61=Invalid value, ''{0}'', specified for hashMaxCapacity override. Value must be greater than 0.
 42Y62=''{0}'' is not allowed on ''{1}'' because it is a view.
 42Y63=Hash join requires an optimizable equijoin predicate on a column in the selected index or heap.  An optimizable equijoin predicate does not exist on any column in table or index ''{0}''. Use the ''index'' optimizer override to specify such an index or the heap on table ''{1}''.
-42Y64=bulkFetch value of ''{0}'' is invalid: the minimum value for bulkFetch is 1.
+42Y64=bulkFetch value of ''{0}'' is invalid. The minimum value for bulkFetch is 1.
 42Y65=bulkFetch is not permitted on ''{0}'' joins.
-42Y66=bulkFetch is not permitted on updateable cursors.
+42Y66=bulkFetch is not permitted on updatable cursors. 
 42Y67=Schema ''{0}'' cannot be dropped.
-42Y69=No valid execution plan was found for this statement. This may have one of two causes: either you specified a hash join strategy when hash join is not allowed (no optimizable equijoin) or you are attempting to join two ExternalVirtualTables, each of which references the other, and so the statement cannot be evaluated.
-42Y70=The user specified join order is not a legal join order. This may be due to a join column from an inner table being passed as a parameter to an external virtual table.
+42Y69=No valid execution plan was found for this statement. This may have one of two causes: either you specified a hash join strategy when hash join is not allowed (no optimizable equijoin) or you are attempting to join two external virtual tables, each of which references the other, and so the statement cannot be evaluated.  
+42Y70=The user specified an illegal join order. This could be caused by a join column from an inner table being passed as a parameter to an external virtual table.
 42Y71=System function or procedure ''{0}'' cannot be dropped.
-42Y82=System generated stored prepared statement ''{0}'' cannot be dropped using DROP STATEMENT.  It is part of a trigger.
+42Y82=System generated stored prepared statement ''{0}'' that cannot be dropped using DROP STATEMENT. It is part of a trigger. 
 42Y83=An untyped null is not permitted as an argument to aggregate {0}.  Please cast the null to a suitable type.
 # NOTE: The parameter to this message is a keyword used as a noun phrase.
 # Some possible values are "subquery", "CurrentDate", and "?".
 42Y84=''{0}'' may not appear in a DEFAULT definition.
 42Y85=The DEFAULT keyword is only allowed in a VALUES clause when the VALUES clause appears within an INSERT statement.
-42Y90=FOR UPDATE is not permitted on this type of statement.
+42Y90=FOR UPDATE is not permitted in this type of statement.  
 42Y91=The USING clause is not permitted in an EXECUTE STATEMENT for a trigger action.
 42Y92={0} triggers may only reference {1} transition variables/tables.
 42Y93=Illegal REFERENCING clause: only one name is permitted for each type of transition variable/table.
-42Y94=An AND or OR has a non-Boolean operand. The operands of AND and OR must evaluate to TRUE, FALSE, or UNKNOWN.
+42Y94=An AND or OR has a non-boolean operand. The operands of AND and OR must evaluate to TRUE, FALSE, or UNKNOWN.  
 42Y95=The ''{0}'' operator with a left operand type of ''{1}'' and a right operand type of ''{2}'' is not supported.
 42Y96.U=UNKNOWN
 42Y97=Invalid escape character at line ''{0}'', column ''{1}''.
@@ -612,11 +612,11 @@
 
 # alter table modify column error messages.
 #####
-42Z15=Invalid Type specified for column ''{0}''. The type of a column may not be changed.
+42Z15=Invalid type specified for column ''{0}''. The type of a column may not be changed.  
 42Z16=Only columns of type VARCHAR may have their length altered. 
-42Z17=Invalid Length specified for Column ''{0}''. Length must be greater than the current column length
-42Z18=Column ''{0}'' is part of a foreign key constraint ''{1}''. To alter the length of this column, you should drop the constraint first, perform the ALTER TABLE and then recreate the constraint.
-42Z19=Column ''{0}'' is being referenced by atleast one foreign key constraint ''{1}''. To alter the length of this column, you should drop referencing constraints, perform the ALTER TABLE and then recreate the constraints.
+42Z17=Invalid length specified for column ''{0}''. Length must be greater than the current column length.
+42Z18=Column ''{0}'' is part of a foreign key constraint ''{1}''. To alter the length of this column, you should drop the constraint first, perform the ALTER TABLE, and then recreate the constraint.
+42Z19=Column ''{0}'' is being referenced by at least one foreign key constraint ''{1}''. To alter the length of this column, you should drop referencing constraints, perform the ALTER TABLE and then recreate the constraints. 
 42Z20=Column ''{0}'' cannot be made nullable. It is part of a primary key, which cannot have any nullable columns.
 
 #####
@@ -624,11 +624,11 @@
 # identity error message (from 42Z21-42Z29)
 #####
 42837=ALTER TABLE ''{0}'' specified attributes for column ''{1}'' that are not compatible with the existing column.
-42Z21=Invalid increment specified for identity for column ''{0}''. Increment must be non zero.
+42Z21=Invalid increment specified for identity for column ''{0}''. Increment cannot be zero.  
 42Z22=Invalid type specified for identity column ''{0}''. The only valid types for identity columns are BIGINT, INT and SMALLINT.
 42Z23=Attempt to modify an identity column ''{0}''. 
 42Z24=Overflow occurred in identity value for column ''{1}'' in table ''{0}''.
-42Z25=INTERNAL ERROR identity Counter: Update was called without arguments with current value = NULL.
+42Z25=INTERNAL ERROR identity counter. Update was called without arguments with current value \= NULL.
 42Z26=A column, ''{0}'', with an identity default cannot be made nullable.
 42Z27=A nullable column, ''{0}'', cannot be modified to have identity default.
 
@@ -909,18 +909,18 @@
 X0X02.S=Table ''{0}'' cannot be locked in ''{1}'' mode.
 X0X03.S=Invalid transaction state - held cursor requires same isolation level
 X0X05.S=Table ''{0}'' does not exist.
-X0X0E.S=Column position ''{0}'' listed in auto-generated column selection array not found in the insert table.
+X0X0E.S=The column position ''{0}'' listed in the auto-generated column selection array was not found in the insert table. 
 X0X0F.S=Column name ''{0}'' listed in auto-generated column selection array not found in the insert table.
 X0X07.S=Cannot drop jar file ''{0}'' because its on your db2j.database.classpath ''{0}''.
-X0X10.S=The USING clause returned more than one row, only single row ResultSets are permissable.
-X0X11.S=The USING clause did not return any results, no parameters can be set.
+X0X10.S=The USING clause returned more than one row; only single-row ResultSets are permissible.
+X0X11.S=The USING clause did not return any results so no parameters can be set. 
 X0X13.S=Jar file ''{0}'' does not exist in schema ''{1}''.
 X0X57.S=An attempt was made to put a Java value of type ''{0}'' into a SQL value, but there is no corresponding SQL type.  The Java value is probably the result of a method call or field access.
 X0X60.S=A cursor with name ''{0}'' already exists.
 X0X61.S=The values for column ''{4}'' in index ''{0}'' and table ''{1}.{2}'' do not match for row location {3}.  The value in the index is ''{5}'', while the value in the base table is ''{6}''.  The full index key, including the row location, is ''{7}''.  The suggested corrective action is to recreate the index.
 X0X62.S=Inconsistency found between table ''{0}'' and index ''{1}''.  Error when trying to retrieve row location ''{2}'' from the table.  The full index key, including the row location, is ''{3}''. The suggested corrective action is to recreate the index.
 X0X63.S=Got IOException ''{0}''.
-X0X67.S=Columns of type ''{0}'' may not be used in CREATE INDEX, ORDER BY, GROUP BY, UNION, INTERSECT, EXCEPT or DISTINCT, because comparisons are not supported for that type.
+X0X67.S=Columns of type ''{0}'' 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.
 X0X81.S={0} ''{1}'' does not exist.
 X0X85.S=Index ''{0}'' was not created because ''{1}'' is not a valid index type.
 X0X86.S=0 is an invalid parameter value for ResultSet.absolute(int row).
@@ -936,19 +936,19 @@
 # column c already exists in table t.
 X0Y32.S={0} ''{1}'' already exists in {2} ''{3}''.
 X0Y38.S=Cannot create index ''{0}'' because table ''{1}'' does not exist.
-X0Y41.S=Constraint ''{0}'' is invalid: referenced table {1} has no primary key.  Either add a primary key to {1} or explicity specify the columns of a unique constraint that this foreign key references.
+X0Y41.S=Constraint ''{0}'' is invalid because the referenced table {1} has no primary key.  Either add a primary key to {1} or explicitly specify the columns of a unique constraint that this foreign key references. 
 X0Y42.S=Constraint ''{0}'' is invalid: the types of the foreign key columns do not match the types of the referenced columns.
 X0Y43.S=Constraint ''{0}'' is invalid: the number of columns in {0} ({1}) does not match the number of columns in the referenced key ({2}).
 X0Y44.S=Constraint ''{0}'' is invalid: there is no unique or primary key constraint on table ''{1}'' that matches the number and types of the columns in the foreign key.
-X0Y45.S=Foreign key constraint ''{0}'' cannot be added to or enabled on table {1} because 1 or more foreign keys do not have matching referenced keys.
+X0Y45.S=Foreign key constraint ''{0}'' cannot be added to or enabled on table {1} because one or more foreign keys do not have matching referenced keys.  
 X0Y46.S=Constraint ''{0}'' is invalid: referenced table {1} does not exist.
 X0Y54.S=Schema ''{0}'' cannot be dropped because it is not empty.
 X0Y55.S=The number of rows in the base table does not match the number of rows in at least 1 of the indexes on the table. Index ''{0}'' on table ''{1}.{2}'' has {3} rows, but the base table has {4} rows.  The suggested corrective action is to recreate the index.
 X0Y56.S=''{0}'' is not allowed on the System table ''{1}''.
-X0Y57.S=A non-nullable column cannot be added to table ''{0}'' because the table contains at least 1 row.  Non-nullable columns can only be added to empty tables.
+X0Y57.S=A non-nullable column cannot be added to table ''{0}'' because the table contains at least one row. Non-nullable columns can only be added to empty tables.
 X0Y58.S=Attempt to add a primary key constraint to table ''{0}'' failed because the table already has a constraint of that type.  A table can only have a single primary key constraint.
 X0Y59.S=Attempt to add or enable constraint(s) on table ''{1}'' failed because the table contains {2} row(s) that violate the following check constraint(s): {0}.
-X0Y63.S=The command on table ''{0}'' failed. Null data found in the primary key or unique constraint/index column(s). All columns in a primary or unique index key must be non null.
+X0Y63.S=The command on table ''{0}'' failed because null data was found in the primary key or unique constraint/index column(s). All columns in a primary or unique index key must not be null.  
 X0Y66.S=Cannot issue commit in a nested connection when there is a pending operation in the parent connection.
 X0Y67.S=Cannot issue rollback in a nested connection when there is a pending operation in the parent connection.
 X0Y68.S={0} ''{1}'' already exists.
@@ -956,27 +956,27 @@
 X0Y70.S=INSERT, UPDATE and DELETE are not permitted on table {1} because trigger {0} is active.
 X0Y71.S=Transaction manipulation such as SET ISOLATION is not permitted because trigger {0} is active.
 X0Y72.S=Bulk insert replace is not permitted on ''{0}'' because it has an enabled trigger ({1}).
-X0Y77.S=Cannot issue set transaction isolation statement on a global transaction that is in progress because it would have implicitly commited the global transaciton. 
+X0Y77.S=Cannot issue set transaction isolation statement on a global transaction that is in progress because it would have implicitly committed the global transaction.
 X0Y78.S=Statement.executeQuery() cannot be called with a statement that returns a row count.
 X0Y79.S=Statement.executeUpdate() cannot be called with a statement that returns a ResultSet.
 X0Y80.S=ALTER table ''{0}'' failed. Null data found in column ''{1}''.
 X0Y83.S=WARNING: While deleting a row from a table the index row for base table row {0} was not found in index with conglomerate id {1}.  This problem has automatically been corrected as part of the delete operation.
-XCL01.S=Result set does not return rows; operation {0} not permitted.
+XCL01.S=Result set does not return rows. Operation {0} not permitted. 
 XCL05.S=Activation closed, operation {0} not permitted.
 XCL07.S=Cursor ''{0}'' is closed. Verify that autocommit is OFF.
 XCL08.S=Cursor ''{0}'' is not on a row.
 XCL09.S=An Activation was passed to the ''{0}'' method that does not match the PreparedStatement.
-XCL10.S=A PreparedStatement has been recompiled, and the parameters have changed.  If you are using JDBC, you must re-prepare the statement.
+XCL10.S=A PreparedStatement has been recompiled and the parameters have changed. If you are using JDBC you must prepare the statement again.  
 XCL12.S=An attempt was made to put a data value of type ''{0}'' into a data value of type ''{1}''.
 XCL13.S=The parameter position ''{0}'' is out of range.  The number of parameters for this prepared  statement is ''{1}''.
 XCL14.S=The column position ''{0}'' is out of range.  The number of columns for this ResultSet is ''{1}''.
 XCL15.S=A ClassCastException occurred when calling the compareTo() method on an object ''{0}''.  The parameter to compareTo() is of class ''{1}''.
-XCL16.S=ResultSet not open, operation ''{0}'' not permitted. Verify that autocommit is OFF.
+XCL16.S=ResultSet not open. Operation ''{0}'' not permitted. Verify that autocommit is OFF.
 XCL17.S=Statement not allowed in this database.
 XCL19.S=Missing row in table ''{0}'' for key ''{1}''.
 XCL20.S=Catalogs at version level ''{0}'' cannot be upgraded to version level ''{1}''.
 XCL21.S=You are trying to execute a Data Definition statement (CREATE, DROP, or ALTER) while preparing a different statement. This is not allowed. It can happen if you execute a Data Definition statement from within a static initializer of a Java class that is being used from within a SQL statement.
-XCL22.S=Parameter {0} cannot be be registered as an OUT parameter because it is an IN parameter.
+XCL22.S=Parameter {0} cannot be registered as an OUT parameter because it is an IN parameter. 
 XCL23.S=SQL type number ''{0}'' is not a supported type by registerOutParameter().
 XCL24.S=Parameter {0} appears to be an output parameter, but it has not been so designated by registerOutParameter().  If it is not an output parameter, then it has to be set to type {1}.
 XCL25.S=Parameter {0} cannot be registered to be of type {1} because it maps to type {2} and they are incompatible.
@@ -990,31 +990,31 @@
 XCL34.S=The table cannot be defined as a dependent of table {0} because of delete rule restrictions. (The relationship forms a cycle of two or more tables that cause the table to be delete-connected to itself (all other delete rules in the cycle would be CASCADE)).  
 XCL35.S=The table cannot be defined as a dependent of table {0} because of delete rule restrictions. (The relationship causes the table to be delete-connected to the indicated table through multiple relationships and the delete rule of the existing relationship is SET NULL.).  
 
-XCL36.S=the delete rule of foreign key  must be {0}. (The referential constraint is self-referencing and an existing self-referencing constraint has the indicated delete rule (NO ACTION, RESTRICT or CASCADE).) 
-XCL37.S=the delete rule of foreign key  must be {0}. (The referential constraint is self-referencing and the table is dependent in a relationship with a delete rule of CASCADE.)
+XCL36.S=The delete rule of foreign key must be {0}. (The referential constraint is self-referencing and an existing self-referencing constraint has the indicated delete rule (NO ACTION, RESTRICT or CASCADE).)
+XCL37.S=The delete rule of foreign key must be {0}. (The referential constraint is self-referencing and the table is dependent in a relationship with a delete rule of CASCADE.)
 XCL38.S=the delete rule of foreign key  must be {0}. (The relationship would cause the table to be delete-connected to the same table through multiple relationships and such relationships must have the same delete rule (NO ACTION, RESTRICT or CASCADE).) 
 
-XCL39.S=the delete rule of foreign key can not be CASCADE. (A self-referencing constraint exists with a delete rule of SET NULL, NO ACTION or RESTRICT.) 
-XCL40.S=the delete rule of foreign key can not be CASCADE. (The relationship would form a cycle that would cause a table to be delete-connected to itself. One of the existing delete rules in the cycle is not CASCADE, so this relationship may be definable if the delete rule is not CASCADE.) 
+XCL39.S=The delete rule of foreign key cannot be CASCADE. (A self-referencing constraint exists with a delete rule of SET NULL, NO ACTION or RESTRICT.) 
+XCL40.S=The delete rule of foreign key cannot be CASCADE. (The relationship would form a cycle that would cause a table to be delete-connected to itself. One of the existing delete rules in the cycle is not CASCADE, so this relationship may be definable if the delete rule is not CASCADE.) 
 XCL41.S=the delete rule of foreign key can not be CASCADE. (The relationship would cause another table to be delete-connected to the same table through multiple paths with different delete rules or with delete rule equal to SET NULL.) 
-XCL42.S="CASCADE"
-XCL43.S="SET NULL"
-XCL44.S="RESTRICT"
-XCL45.S="NO ACTION"
-XCL46.S="SET DEFAULT"
+XCL42.S=CASCADE
+XCL43.S=SET NULL
+XCL44.S=RESTRICT
+XCL45.S=NO ACTION
+XCL46.S=SET DEFAULT
 
 XCL47.S=Use of ''{0}'' requires database to be upgraded from version {1} to version {2} or later.
 
 XCL48.S= TRUNCATE TABLE is not permitted on ''{0}'' because unique/primary key constraints on this table are referenced by enabled foreign key constraints from other tables. 
 XCL49.S= TRUNCATE TABLE is not permitted on ''{0}'' because it has an enabled DELETE trigger ({1}).
-XCL50.S=Upgrade of Database from a previous version is not suported.  Database being accessed is at version level ''{0}'', this softare is at version level ''{1}''.
+XCL50.S=Upgrading the database from a previous version is not supported.  The database being accessed is at version level ''{0}'', this software is at version level ''{1}''.    
 
 
 # Transaction states, matches DB2
 25000=Invalid transaction state.
 
 # Authorization
-25501=Unable to set the connection read only property in an active transaction.
+25501=Unable to set the connection read-only property in an active transaction.
 25502=An SQL data change is not permitted for a read-only connection, user or database.
 25503=DDL is not permitted for a read-only connection, user or database.
 25505=A read-only user or a user in a read-only database is not permitted to disable read-only mode on a connection.
@@ -1073,15 +1073,15 @@
 XJ066.S=Invalid parameter value ''{0}'' for Statement.setMaxFieldSize(int max).
 XJ067.S=SQL text pointer is null.
 XJ068.S=Only executeBatch and clearBatch allowed in the middle of a batch.
-XJ069.S=No SetXXX methods allowed in case of Execute Statement Using.
-XJ080.S=Execute Statement Using passed {0} parameters rather than {1}.
+XJ069.S=No SetXXX methods allowed in case of USING execute statement.
+XJ080.S=USING execute statement passed {0} parameters rather than {1}.
 XJ081.S=Invalid value ''{0}'' passed as parameter ''{1}'' to method ''{2}''
 XJ070.S=Negative or zero position argument ''{0}'' passed in a Blob or Clob method.
-XJ071.S=Zero or negative length argument ''{0}'' passed in a Blob or Clob method.
-XJ072.S=Null pattern or searchStr passed in to a Blob or Clob position method.
-XJ073.S=The data in this Blob or Clob is no longer available. Possible reasons are that its transaction committed, or its connection closed.
-XJ076.S=The position argument ''{0}'' exceeds the size of the Blob/Clob.
-XJ077.S=Got an exception when trying to read the first byte/character of the Blob/Clob pattern using getBytes/getSubString.
+XJ071.S=Zero or negative length argument ''{0}'' passed in a BLOB or CLOB method.
+XJ072.S=Null pattern or searchStr passed in to a BLOB or CLOB position method.
+XJ073.S=The data in this BLOB or CLOB is no longer available.  The BLOB or CLOB's transaction may be committed, or its connection is closed.
+XJ076.S=The position argument ''{0}'' exceeds the size of the BLOB/CLOB.
+XJ077.S=Got an exception when trying to read the first byte/character of the BLOB/CLOB pattern using getBytes/getSubString.
 XJ082.U=BLOB/CLOB values are not allowed as method parameters or receiver.
 XJ083.U=''{0}'' not allowed because the ResultSet is not an updatable ResultSet. 
 XJ084.U=Column does not correspond to a column in the base table. Can't issue {0} on this column.
@@ -1212,20 +1212,20 @@
 
 # Import/Export
 XIE01.S=Connection was null.
-XIE03.S=Data found on line {0} for column {1} after the stop delimiter
+XIE03.S=Data found on line {0} for column {1} after the stop delimiter.  
 XIE04.S=Data file not found: {0}
-XIE05.S=Data file can not be null.
+XIE05.S=Data file cannot be null. 
 XIE06.S=Entity name was null.
-XIE07.S=Field & record separators can't be substring of each other.
-XIE08.S=There is no column by name: {0}
-XIE09.S=Total number of columns in the row are: {0}
-XIE0B.S=Column ''{0}'' in the table is of type {1}, it is not supported by import/export.
-XIE0D.S=Can''t find record separator on line {0}
-XIE0E.S=Read endOfFile at unexpected place on line {0}
-XIE0I.S=Got IOException while writing data to the file
+XIE07.S=Field and record separators cannot be substrings of each other. 
+XIE08.S=There is no column named: {0}.  
+XIE09.S=The total number of columns in the row is: {0}.  
+XIE0B.S=Column ''{0}'' in the table is of type {1}, it is not supported by the import/export feature.   
+XIE0D.S=Cannot find the record separator on line {0}.
+XIE0E.S=Read endOfFile at unexpected place on line {0}.
+XIE0I.S=An IOException occurred while writing data to the file.
 XIE0J.S=A delimiter is not valid or is used more than once.
 XIE0K.S=The period was specified as a character string delimiter.
-XIE0M.S=Table ''{0}'' does not exist.
+XIE0M.S=Table ''{0}'' does not exist.  
 
 # Monitor
 M001=\n# ********************************************************************\n# ***                Please do NOT edit this file.                 ***\n# *** CHANGING THE CONTENT OF THIS FILE MAY CAUSE DATA CORRUPTION. ***\n# ********************************************************************

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml112.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml112.out?rev=178809&r1=178808&r2=178809&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml112.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml112.out Fri May 27 11:42:22 2005
@@ -294,7 +294,7 @@
 ij> -- PASS:0625 If 1 row is inserted?
    SELECT COUNT(*) 
      FROM CHANGG WHERE DIVORCES IS NULL;
-ERROR 42X04: Column 'DIVORCES' 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 'DIVORCES' is not a column in the target table.
+ERROR 42X04: Column 'DIVORCES' 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 'DIVORCES' is not a column in the target table.
 ij> -- PASS:0625 If ERROR, column does not exist?
    COMMIT WORK;
 ij> ALTER TABLE CHANGG ADD NUMBRR CHAR(11);
@@ -307,7 +307,7 @@
 106        
 ij> -- PASS:0625 If value is 106?
    SELECT MAX(NUMBRR) FROM CHANGGVIEW;
-ERROR 42X04: Column 'NUMBRR' 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 'NUMBRR' is not a column in the target table.
+ERROR 42X04: Column 'NUMBRR' 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 'NUMBRR' is not a column in the target table.
 ij> -- PASS:0625 If ERROR, column does not exist ?
    COMMIT WORK;
 ij> --O   DROP VIEW CHANGGVIEW CASCADE;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml147.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml147.out?rev=178809&r1=178808&r2=178809&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml147.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dml147.out Fri May 27 11:42:22 2005
@@ -37,7 +37,7 @@
    ROLLBACK WORK;
 ij> SELECT COUNT (*)
   FROM USIG WHERE NUL IS NULL;
-ERROR 42X04: Column 'NUL' 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 'NUL' is not a column in the target table.
+ERROR 42X04: Column 'NUL' 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 'NUL' is not a column in the target table.
 ij> -- PASS:0840 If ERROR, syntax error/access violation, 0 rows selected?
    ROLLBACK WORK;
 ij> --O   DROP TABLE USIG CASCADE;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/procedure.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/procedure.out?rev=178809&r1=178808&r2=178809&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/procedure.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/procedure.out Fri May 27 11:42:22 2005
@@ -245,7 +245,7 @@
 Testing too many result sets
 ... too many result sets
 selectRows - 2 arg - 2 rs
-WARNING 0100E: XX Attepmt to return too many result sets
+WARNING 0100E: XX Attempt to return too many result sets.
 I          |B              
 ---------------------------
 2          |int            

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schema5.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schema5.out?rev=178809&r1=178808&r2=178809&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schema5.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/schema5.out Fri May 27 11:42:22 2005
@@ -104,7 +104,7 @@
    --   UNIQUE (C1,C2), UNIQUE (C3), UNIQUE (C2,C1))
    CREATE TABLE T0512 (C1 INT NOT NULL, C2 INT NOT NULL, C3 INT NOT NULL,
    UNIQUE (C1,C2), UNIQUE (C3), UNIQUE (C2,C1));
-ERROR 42Z93: Constraints 'xxxxGENERATED-IDxxxx' and 'xxxxGENERATED-IDxxxx' have same set of columns, which is not allowed.
+ERROR 42Z93: Constraints 'xxxxGENERATED-IDxxxx' and 'xxxxGENERATED-IDxxxx' have the same set of columns, which is not allowed. 
 ij> --0 PASS: if there was an error for a duplicate unique constraint
    -- Check for erratum which allowed recursive view definitions.
    -- Reference ISO/IEC JTC1/SC21 N6789 section 11.19 <view definition> SR4



Mime
View raw message