svn commit: r436659 - in /db/derby/code/branches/10.2/java: drda/org/apache/derby/loc/drda/messages_en.properties engine/org/apache/derby/loc/messages_en.properties testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out

[fu...@apache.org]

Author: fuzzylogic
Date: Thu Aug 24 22:01:04 2006
New Revision: 436659

URL: http://svn.apache.org/viewvc?rev=436659&view=rev
Log:
Merge revision 436658 to 10.2 branch

Modified:
    db/derby/code/branches/10.2/java/drda/org/apache/derby/loc/drda/messages_en.properties
    db/derby/code/branches/10.2/java/engine/org/apache/derby/loc/messages_en.properties
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out

Modified: db/derby/code/branches/10.2/java/drda/org/apache/derby/loc/drda/messages_en.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/drda/org/apache/derby/loc/drda/messages_en.properties?rev=436659&r1=436658&r2=436659&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/drda/org/apache/derby/loc/drda/messages_en.properties (original)
+++ db/derby/code/branches/10.2/java/drda/org/apache/derby/loc/drda/messages_en.properties Thu Aug 24 22:01:04 2006
@@ -38,7 +38,7 @@
 DRDA_UnknownArgument.U=Argument {0} is unknown.
 DRDA_UnknownCommand.U=Command {0} is unknown.
 DRDA_InvalidValue.U=Invalid value, {0}, for {1}.
-DRDA_OnOffValue.U=Invalid value, {0}. Value must be 'on' or 'off'.
+DRDA_OnOffValue.U=Invalid value, {0}. Value must be ''on'' or ''off''.
 DRDA_PortNumber.I=port number
 DRDA_Host.I=host
 DRDA_DatabaseDirectory.I=database directory

Modified: db/derby/code/branches/10.2/java/engine/org/apache/derby/loc/messages_en.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/engine/org/apache/derby/loc/messages_en.properties?rev=436659&r1=436658&r2=436659&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/engine/org/apache/derby/loc/messages_en.properties (original)
+++ db/derby/code/branches/10.2/java/engine/org/apache/derby/loc/messages_en.properties Thu Aug 24 22:01:04 2006
@@ -197,7 +197,7 @@
 # sqlstate range: XSAS0 to XSASZ
 
 XSAS6.S=Could not acquire resources for sort.
-XSAS3.S=The type of a row inserted into a sort does not match the sort's template.
+XSAS3.S=The type of a row inserted into a sort does not match the sort''s template.
 XSAS1.S=An attempt was made to fetch a row before the beginning of a sort or after the end of a sort.
 XSAS0.S=A scan controller interface method was called which is not appropriate for a scan on a sort.
 
@@ -443,7 +443,7 @@
 22005=An attempt was made to get a data value of type ''{0}'' from a data value of type ''{1}''.
 22005.S.1=Unable to convert a value of type ''{0}'' to type ''{1}'' : the encoding is not supported.
 22005.S.2=The required character converter is not available.
-22005.S.3=Unicode string can't convert to Ebcdic string
+22005.S.3=Unicode string cannot convert to Ebcdic string
 22005.S.4=Unrecognized JDBC type. Type: {0}, columnCount: {1}, columnIndex: {2}.
 22005.S.5=Invalid JDBC type for parameter {0}.
 22005.S.6=Unrecognized Java SQL type {0}.
@@ -458,7 +458,7 @@
 22015.S.1= Invalid data conversion: requested conversion would result in a loss of precision of {0}
 22018=Invalid character string format for type {0}.
 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.
+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.
 22028=The string exceeds the maximum length of {0}.
 22501=An ESCAPE clause of NULL returns undefined results and is not allowed.
@@ -766,7 +766,7 @@
 
 
 42Z50=INTERNAL ERROR: Unable to generate code for {0}.
-42Z53=INTERNAL ERROR: Don't know what type of activation to generate for node choice {0}.
+42Z53=INTERNAL ERROR: Type of activation to generate for node choice {0} is unknown.
 42Z54.U=This excepiton stops the statement after parsing - no further processing is needed.
 42Z55.U=Execution stopped after parsing by StopAfterParsing debug flag.
 42Z56.U=Execution stopped after binding by StopAfterBinding debug flag.
@@ -1223,7 +1223,7 @@
 XJ070.S=Negative or zero position argument ''{0}'' passed in a Blob or Clob method.
 XJ071.S=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.
+XJ073.S=The data in this BLOB or CLOB is no longer available.  The BLOB/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.
 XJ078.S=Offset ''{0}'' is either less than zero or is too large for the current BLOB/CLOB.

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out?rev=436659&r1=436658&r2=436659&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out (original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/blobclob4BLOB.out Thu Aug 24 22:01:04 2006
@@ -568,15 +568,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.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB/CLOB's 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.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB/CLOB's 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.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB/CLOB's 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.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB/CLOB's 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.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB/CLOB's transaction may be committed, or its connection is closed.
 clobTest94 finished
 START: clobTest95
 shortClob length after closing connection is 26
@@ -587,7 +587,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.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB/CLOB's transaction may be committed, or its connection is closed.
 FAIL -- unexpected exception ****************
 SQLSTATE(08003): No current connection.
 clobTest95 finished
@@ -832,28 +832,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.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB/CLOB's 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.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB/CLOB's 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.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB/CLOB's 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.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB/CLOB's 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.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB/CLOB's 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.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB/CLOB's 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.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB/CLOB's 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.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB/CLOB's 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.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB/CLOB's 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.  The BLOB or CLOBs transaction may be committed, or its connection is closed.
+SQLSTATE(XJ073): The data in this BLOB or CLOB is no longer available.  The BLOB/CLOB's transaction may be committed, or its connection is closed.
 blobTest95 finished
 START: blobTest96
 blobTest96 finished