db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1369173 [1/4] - in /db/derby/code/trunk/java: drda/org/apache/derby/loc/drda/ engine/org/apache/derby/iapi/sql/ engine/org/apache/derby/iapi/sql/dictionary/ engine/org/apache/derby/loc/ shared/org/apache/derby/shared/common/reference/ test...
Date Fri, 03 Aug 2012 19:26:53 GMT
Author: rhillegas
Date: Fri Aug  3 19:26:51 2012
New Revision: 1369173

URL: http://svn.apache.org/viewvc?rev=1369173&view=rev
Log:
DERBY-5879: Fix translatability problems having to do with ALL CAPS and camelCase words.

Modified:
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/StatementUtil.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DDUtils.java
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml
    db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/LocalizedDisplay.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cast.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cursorerrors.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dbManagerLimits.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test_territory.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/depend.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/implicitConversions.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/importExportIJ.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/nestedCommit.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/outparams.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/positionedDelUpd.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/update.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/xaHelper.java
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java
    db/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties?rev=1369173&r1=1369172&r2=1369173&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties Fri Aug  3 19:26:51 2012
@@ -78,7 +78,7 @@ DRDA_PropInfoError.S=Error getting prope
 DRDA_PropInfoWriteError.S=Error in writing properties information:\n {0}
 DRDA_ProductVersionReadError.S=Error reading product version information from Derby installation. {0}.
 
-DRDA_InvalidClient.S=ERROR UNSUPPORTED CLIENT: Invalid client product id {0}, Derby Network Client (DNC) is the only supported client Product
+DRDA_InvalidClient.S=Error Unsupported Client: Invalid client product id {0}, Derby Network Client (DNC) is the only supported client Product
 DRDA_ConnectionTested.I=Connection obtained for host: {0}, port number {1}.
 DRDA_ConnectionTested2.I=Connection obtained for host: {0}, port {1}, database {2}.
 DRDA_ConnectionTested3.I=Connection obtained for host: {0}, port {1}, database {2}, user {3}.
@@ -128,13 +128,13 @@ DRDA_RuntimeInfo
 #
 DRDA_Usage1.I=Usage: NetworkServerControl <commands> 
 DRDA_Usage2.I=Commands:
-DRDA_Usage3.I=start [-h <host>] [-p <portnumber>] [-noSecurityManager] [-ssl <sslmode>]
-DRDA_Usage4.I=shutdown [-h <host>][-p <portnumber>] [-ssl <sslmode>] [-user <username>] [-password <password>]
-DRDA_Usage5.I=ping [-h <host>][-p <portnumber>] [-ssl <sslmode>]
-DRDA_Usage6.I=sysinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]
-DRDA_Usage7.I=runtimeinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]
-DRDA_Usage8.I=logconnections '{on|off}' [-h <host>][-p <portnumber>] [-ssl <sslmode>]
-DRDA_Usage9.I=maxthreads <max>[-h <host>][-p <portnumber>] [-ssl <sslmode>]
-DRDA_Usage10.I=timeslice <milliseconds>[-h <host>][-p <portnumber>] [-ssl <sslmode>]
-DRDA_Usage11.I=trace '{on|off}' [-s <session id>][-h <host>][-p <portnumber>] [-ssl <sslmode>]
-DRDA_Usage12.I=tracedirectory <traceDirectory>[-h <host>][-p <portnumber>] [-ssl <sslmode>]
+DRDA_Usage3.I=start [-h <host>] [-p <port number>] [-noSecurityManager] [-ssl <ssl mode>]
+DRDA_Usage4.I=shutdown [-h <host>][-p <port number>] [-ssl <ssl mode>] [-user <username>] [-password <password>]
+DRDA_Usage5.I=ping [-h <host>][-p <port number>] [-ssl <ssl mode>]
+DRDA_Usage6.I=sysinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]
+DRDA_Usage7.I=runtimeinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]
+DRDA_Usage8.I=logconnections '{on|off}' [-h <host>][-p <port number>] [-ssl <ssl mode>]
+DRDA_Usage9.I=maxthreads <max>[-h <host>][-p <port number>] [-ssl <ssl mode>]
+DRDA_Usage10.I=timeslice <milliseconds>[-h <host>][-p <port number>] [-ssl <ssl mode>]
+DRDA_Usage11.I=trace '{on|off}' [-s <session id>][-h <host>][-p <port number>] [-ssl <ssl mode>]
+DRDA_Usage12.I=tracedirectory <trace directory>[-h <host>][-p <port number>] [-ssl <ssl mode>]

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/StatementUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/StatementUtil.java?rev=1369173&r1=1369172&r2=1369173&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/StatementUtil.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/StatementUtil.java Fri Aug  3 19:26:51 2012
@@ -49,7 +49,7 @@ public class StatementUtil
 			break;
 
 		  default:
-			retval = MessageService.getTextMessage(SQLState.LANG_UNKNOWN);
+			retval = "UNKNOWN";
 			break;
 		}
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DDUtils.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DDUtils.java?rev=1369173&r1=1369172&r2=1369173&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DDUtils.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DDUtils.java Fri Aug  3 19:26:51 2012
@@ -861,22 +861,21 @@ public	class	DDUtils
 		String raRuleStringId;
 		switch (raRule){
 		case StatementType.RA_CASCADE:
-			raRuleStringId = SQLState.LANG_DELETE_RULE_CASCADE;
+			raRuleStringId = "CASCADE";
 			break;
 		case StatementType.RA_RESTRICT:
-			raRuleStringId = SQLState.LANG_DELETE_RULE_RESTRICT;
+			raRuleStringId = "RESTRICT";
 				break;
-		case StatementType.RA_NOACTION:
-			raRuleStringId = SQLState.LANG_DELETE_RULE_NOACTION;
-			break;
 		case StatementType.RA_SETNULL:
-			raRuleStringId = SQLState.LANG_DELETE_RULE_SETNULL;
+			raRuleStringId = "SET NULL";
 			break;
 		case StatementType.RA_SETDEFAULT:
-			raRuleStringId = SQLState.LANG_DELETE_RULE_SETDEFAULT;
+			raRuleStringId = "SET DEFAULT";
 			break;
+		case StatementType.RA_NOACTION:
 		default: 
-			raRuleStringId =SQLState.LANG_DELETE_RULE_NOACTION ; // NO ACTION (default value)
+			raRuleStringId = "NO ACTION";
+			break;
 		}
 
 		String raRuleMessageString = MessageService.getTextMessage(raRuleStringId); 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml?rev=1369173&r1=1369172&r2=1369173&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml Fri Aug  3 19:26:51 2012
@@ -112,7 +112,7 @@ Guide.
 
             <msg>
                 <name>0100E</name>
-                <text>XX Attempt to return too many result sets. </text>
+                <text>Attempt to return too many result sets. </text>
             </msg>
 
             <msg>
@@ -692,12 +692,12 @@ Guide.
 
             <msg>
                 <name>22007.S.180</name>
-                <text>The string representation of a datetime value is out of range.</text>
+                <text>The string representation of a date/time value is out of range.</text>
             </msg>
 
             <msg>
                 <name>22007.S.181</name>
-                <text>The syntax of the string representation of a datetime value is incorrect.</text>
+                <text>The syntax of the string representation of a date/time value is incorrect.</text>
             </msg>
 
             <msg>
@@ -716,18 +716,18 @@ Guide.
 
             <msg>
                 <name>2200L</name>
-                <text>Values assigned to XML columns must be well-formed DOCUMENT nodes.</text>
+                <text>Values assigned to XML columns must be well-formed Document nodes.</text>
             </msg>
 
             <msg>
                 <name>2200M</name>
-                <text>Invalid XML DOCUMENT: {0}</text>
+                <text>Invalid XML Document: {0}</text>
                 <arg>parserError</arg>
             </msg>
 
             <msg>
                 <name>2200V</name>
-                <text>Invalid context item for {0} operator; context items must be well-formed DOCUMENT nodes.</text>
+                <text>Invalid context item for {0} operator; context items must be well-formed Document nodes.</text>
                 <arg>operatorName</arg>
             </msg>
 
@@ -944,7 +944,7 @@ Guide.
 
             <msg>
                 <name>2D521.S.2</name>
-                <text>COMMIT or ROLLBACK invalid for application execution environment. </text>
+                <text>Commit or Rollback invalid for application execution environment. </text>
             </msg>
 
         </family>
@@ -1010,7 +1010,7 @@ Guide.
 
             <msg>
                 <name>3B502.S</name>
-                <text>A RELEASE or ROLLBACK TO SAVEPOINT was specified, but the savepoint does not exist.</text>
+                <text>A Release or Rollback to Savepoint was specified, but the savepoint does not exist.</text>
             </msg>
 
         </family>
@@ -1696,7 +1696,7 @@ Guide.
 
             <msg>
                 <name>42X30</name>
-                <text>Cursor '{0}' not found. Verify that autocommit is OFF.</text>
+                <text>Cursor '{0}' not found. Verify that autocommit is off.</text>
                 <arg>cursorName</arg>
             </msg>
 
@@ -2126,7 +2126,7 @@ Guide.
 
             <msg>
                 <name>42XA2</name>
-                <text>'{0}' cannot appear in a GENERATION CLAUSE because it may return unreliable results.</text>
+                <text>'{0}' cannot appear in a Generation Clause because it may return unreliable results.</text>
                 <arg>sqlObjectName</arg>
             </msg>
 
@@ -2144,7 +2144,7 @@ Guide.
 
             <msg>
                 <name>42XA5</name>
-                <text>Routine '{0}' may issue SQL and therefore cannot appear in a GENERATION CLAUSE.</text>
+                <text>Routine '{0}' may issue SQL and therefore cannot appear in a Generation Clause.</text>
                 <arg>routineName</arg>
             </msg>
 
@@ -2580,7 +2580,7 @@ Guide.
 
             <msg>
                 <name>42Y83</name>
-                <text>An untyped null is not permitted as an argument to aggregate {0}.  Please cast the null to a suitable type.</text>
+                <text>An untyped NULL is not permitted as an argument to aggregate {0}.  Please cast the NULL to a suitable type.</text>
                 <arg>aggregateName</arg>
             </msg>
 
@@ -2724,7 +2724,7 @@ Guide.
 
             <msg>
                 <name>42Z25</name>
-                <text>INTERNAL ERROR identity counter. Update was called without arguments with current value \= NULL.</text>
+                <text>Internal Error identity counter. Update was called without arguments with current value \= NULL.</text>
             </msg>
 
             <msg>
@@ -2741,13 +2741,13 @@ Guide.
 
             <msg>
                 <name>42Z50</name>
-                <text>INTERNAL ERROR: Unable to generate code for {0}.</text>
+                <text>Internal Error: Unable to generate code for {0}.</text>
                 <arg>queryTreeNodeIdentifier</arg>
             </msg>
 
             <msg>
                 <name>42Z53</name>
-                <text>INTERNAL ERROR: Type of activation to generate for node choice {0} is unknown.</text>
+                <text>Internal Error: Type of activation to generate for node choice {0} is unknown.</text>
                 <arg>number</arg>
             </msg>
 
@@ -2930,7 +2930,7 @@ Guide.
 
             <msg>
                 <name>42ZB5</name>
-                <text>Class '{0}' implements VTICosting but does not provide a public, no-arg constructor.</text>
+                <text>Class '{0}' implements VTICosting but does not provide a public, no-argument constructor.</text>
                 <arg>className</arg>
             </msg>
 
@@ -3506,7 +3506,7 @@ Guide.
 
             <msg>
                 <name>X0Y83.S</name>
-                <text>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.</text>
+                <text>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.</text>
                 <arg>rowName</arg>
                 <arg>id</arg>
             </msg>
@@ -3589,7 +3589,7 @@ Guide.
 
             <msg>
                 <name>XBCX1.S</name>
-                <text>Initializing cipher with illegal mode, must be either ENCRYPT or DECRYPT.</text>
+                <text>Initializing cipher with illegal mode, must be either CipherFactory.ENCRYPT or CipherFactory.DECRYPT.</text>
             </msg>
 
             <msg>
@@ -3959,7 +3959,7 @@ ln=lower-case two-letter ISO-639 languag
 
             <msg>
                 <name>XCL07.S</name>
-                <text>Cursor '{0}' is closed. Verify that autocommit is OFF.</text>
+                <text>Cursor '{0}' is closed. Verify that autocommit is off.</text>
                 <arg>cursorName</arg>
             </msg>
 
@@ -4010,7 +4010,7 @@ ln=lower-case two-letter ISO-639 languag
 
             <msg>
                 <name>XCL16.S</name>
-                <text>ResultSet not open. Operation '{0}' not permitted. Verify that autocommit is OFF.</text>
+                <text>ResultSet not open. Operation '{0}' not permitted. Verify that autocommit is off.</text>
                 <arg>operation</arg>
             </msg>
 
@@ -4139,31 +4139,6 @@ ln=lower-case two-letter ISO-639 languag
             </msg>
 
             <msg>
-                <name>XCL42.S</name>
-                <text>CASCADE</text>
-            </msg>
-
-            <msg>
-                <name>XCL43.S</name>
-                <text>SET NULL</text>
-            </msg>
-
-            <msg>
-                <name>XCL44.S</name>
-                <text>RESTRICT</text>
-            </msg>
-
-            <msg>
-                <name>XCL45.S</name>
-                <text>NO ACTION</text>
-            </msg>
-
-            <msg>
-                <name>XCL46.S</name>
-                <text>SET DEFAULT</text>
-            </msg>
-
-            <msg>
                 <name>XCL47.S</name>
                 <text>Use of '{0}' requires database to be upgraded from version {1} to version {2} or later.</text>
                 <arg>sqlText</arg>
@@ -4384,7 +4359,7 @@ ln=lower-case two-letter ISO-639 languag
 
             <msg>
                 <name>XIE0E.S</name>
-                <text>Read endOfFile at unexpected place on line {0}.</text>
+                <text>Read end of file at unexpected place on line {0}.</text>
                 <arg>lineNumber</arg>
             </msg>
 
@@ -4518,7 +4493,7 @@ ln=lower-case two-letter ISO-639 languag
 
             <msg>
                 <name>XJ020.S</name>
-                <text>Object type not convertible to TYPE '{0}', invalid java.sql.Types value, or object was null.</text>
+                <text>Object type not convertible to type '{0}', invalid java.sql.Types value, or object was null.</text>
                 <arg>typeName</arg>
             </msg>
 
@@ -4551,7 +4526,7 @@ ln=lower-case two-letter ISO-639 languag
 
             <msg>
                 <name>XJ030.S</name>
-                <text>Cannot set AUTOCOMMIT ON when in a nested connection.</text>
+                <text>Cannot set Autocommit On when in a nested connection.</text>
             </msg>
 
             <msg>
@@ -4609,7 +4584,7 @@ ln=lower-case two-letter ISO-639 languag
 
             <msg>
                 <name>XJ056.S</name>
-                <text>Cannot set AUTOCOMMIT ON when in an XA connection.</text>
+                <text>Cannot set Autocommit On when in an XA connection.</text>
             </msg>
 
             <msg>
@@ -5186,7 +5161,7 @@ ln=lower-case two-letter ISO-639 languag
 
             <msg>
                 <name>XRE05.C</name>
-                <text>The log files on the master and slave are not in synch for replicated database '{0}'. The master log instant is {1}:{2}, whereas the slave log instant is {3}:{4}. This is FATAL for replication - replication will be stopped.</text>
+                <text>The log files on the master and slave are not in synch for replicated database '{0}'. The master log instant is {1}:{2}, whereas the slave log instant is {3}:{4}. This is fatal for replication - replication will be stopped.</text>
                 <arg>dbname</arg>
                 <arg>masterfile</arg>
                 <arg>masteroffset</arg>
@@ -5686,7 +5661,7 @@ ln=lower-case two-letter ISO-639 languag
 
             <msg>
                 <name>XSDB7.D</name>
-                <text>WARNING: Derby (instance {0}) is attempting to boot the database {1} even though Derby (instance {2}) may still be active.  Only one instance of Derby should boot a database at a time. Severe and non-recoverable corruption can result and may have already occurred.</text>
+                <text>Warning: Derby (instance {0}) is attempting to boot the database {1} even though Derby (instance {2}) may still be active.  Only one instance of Derby should boot a database at a time. Severe and non-recoverable corruption can result and may have already occurred.</text>
                 <arg>derbyInstanceID</arg>
                 <arg>databaseName</arg>
                 <arg>derbyInstanceID</arg>
@@ -5694,7 +5669,7 @@ ln=lower-case two-letter ISO-639 languag
 
             <msg>
                 <name>XSDB8.D</name>
-                <text>WARNING: Derby (instance {0}) is attempting to boot the database {1} even though Derby (instance {2}) may still be active.  Only one instance of Derby should boot a database at a time. Severe and non-recoverable corruption can result if 2 instances of Derby boot on the same database at the same time.  The derby.database.forceDatabaseLock=true property has been set, so the database will not boot until the db.lck is no longer present.  Normally this file is removed when the first instance of Derby to boot on the database exits, but it may be left behind in some shutdowns.  It will be necessary to remove the file by hand in that case.  It is important to verify that no other VM is accessing the database before deleting the db.lck file by hand.</text>
+                <text>Warning: Derby (instance {0}) is attempting to boot the database {1} even though Derby (instance {2}) may still be active.  Only one instance of Derby should boot a database at a time. Severe and non-recoverable corruption can result if 2 instances of Derby boot on the same database at the same time.  The derby.database.forceDatabaseLock=true property has been set, so the database will not boot until the db.lck is no longer present.  Normally this file is removed when the first instance of Derby to boot on the database exits, but it may be left behind in some shutdowns.  It will be necessary to remove the file by hand in that case.  It is important to verify that no other VM is accessing the database before deleting the db.lck file by hand.</text>
                 <arg>derbyInstanceID</arg>
                 <arg>databaseName</arg>
                 <arg>derbyInstanceID</arg>
@@ -6251,18 +6226,13 @@ MessageId.java.
             </msg>
 
             <msg>
-                <name>42Y96.U</name>
-                <text>UNKNOWN</text>
-            </msg>
-
-            <msg>
                 <name>42Z00.U</name>
                 <text>Java method call or field reference</text>
             </msg>
 
             <msg>
                 <name>42Z01.U</name>
-                <text>UNTYPED</text>
+                <text>Untyped</text>
             </msg>
 
             <msg>
@@ -7298,7 +7268,7 @@ MessageId.java.
 
             <msg>
                 <name>54004</name>
-                <text>SELECT statement has too many items in GROUP BY, ORDER BY or select list.</text>
+                <text>SELECT statement has too many items in GROUP BY, ORDER BY or SELECT list.</text>
             </msg>
 
             <msg>
@@ -7497,17 +7467,17 @@ MessageId.java.
 
             <msg>
                 <name>A001</name>
-                <text>FATAL: There is no Authentication Service for the system</text>
+                <text>Fatal: There is no Authentication Service for the system</text>
             </msg>
 
             <msg>
                 <name>A002</name>
-                <text>FATAL: There is no Authentication Service for the database</text>
+                <text>Fatal: There is no Authentication Service for the database</text>
             </msg>
 
             <msg>
                 <name>A011</name>
-                <text>WARNING: No LDAP Server/Host name mentioned in {0} property; assuming localhost:389</text>
+                <text>Warning: No LDAP Server/Host name mentioned in {0} property; assuming localhost:389</text>
                 <arg>propertyName</arg>
             </msg>
 
@@ -7678,7 +7648,7 @@ Shutting down instance {0} on database d
 
             <msg>
                 <name>D013</name>
-                <text>WARNING: The database is booted with {0}={1}. In this mode, it is possible that database may not be able to recover, committed transactions may be lost, database may be in an inconsistent state. Please use this mode only when these consequences are acceptable  
+                <text>Warning: The database is booted with {0}={1}. In this mode, it is possible that database may not be able to recover, committed transactions may be lost, database may be in an inconsistent state. Please use this mode only when these consequences are acceptable  
 </text>
                 <arg>durabilityProperty</arg>
                 <arg>noSync</arg>
@@ -8028,47 +7998,47 @@ Shutting down instance {0} on database d
 
             <msg>
                 <name>L001</name>
-                <text>------------  BEGIN ERROR MESSAGE -------------
+                <text>------------  Begin Error Message -------------
 </text>
             </msg>
 
             <msg>
                 <name>L002</name>
-                <text>------------  END ERROR MESSAGE -------------
+                <text>------------  End Error Message -------------
 </text>
             </msg>
 
             <msg>
                 <name>L003</name>
                 <text>
-------------  BEGIN SHUTDOWN ERROR STACK -------------
+------------  Begin Shutdown Error Stack -------------
 </text>
             </msg>
 
             <msg>
                 <name>L004</name>
                 <text>
-------------  END SHUTDOWN ERROR STACK -------------
+------------  End Shutdown Error Stack -------------
 </text>
             </msg>
 
             <msg>
                 <name>L005</name>
                 <text>
-------------  BEGIN ERROR STACK -------------
+------------  Begin Error Stack -------------
 </text>
             </msg>
 
             <msg>
                 <name>L006</name>
                 <text>
-------------  END ERROR STACK -------------
+------------  End Error Stack -------------
 </text>
             </msg>
 
             <msg>
                 <name>L007</name>
-                <text>WARNING: Log file not found, creating new log. Possible inconsistency in the database</text>
+                <text>Warning: Log file not found, creating new log. Possible inconsistency in the database</text>
             </msg>
 
             <msg>
@@ -8140,7 +8110,7 @@ Shutting down instance {0} on database d
 
             <msg>
                 <name>L020</name>
-                <text>WARNING: The database was at least at one time booted with {0}={1}. As a result of this mode being used, it is possible that the database may not be able to recover, committed transactions may be lost, and the database may be in an inconsistent state. This may cause unexpected errors.
+                <text>Warning: The database was at least at one time booted with {0}={1}. As a result of this mode being used, it is possible that the database may not be able to recover, committed transactions may be lost, and the database may be in an inconsistent state. This may cause unexpected errors.
 </text>
                 <arg>testModeProperty</arg>
                 <arg>testMode</arg>
@@ -8148,7 +8118,7 @@ Shutting down instance {0} on database d
 
             <msg>
                 <name>L021</name>
-                <text>WARNING: The database was either previously booted or is currently booted with {0} set to {1}. Note that this mode {0}={1} does not guarantee recoverability, and is probably what might have caused this boot error.
+                <text>Warning: The database was either previously booted or is currently booted with {0} set to {1}. Note that this mode {0}={1} does not guarantee recoverability, and is probably what might have caused this boot error.
 </text>
                 <arg>testModeProperty</arg>
                 <arg>testMode</arg>
@@ -8157,7 +8127,7 @@ Shutting down instance {0} on database d
             </msg>
             <msg>
                <name>L022</name>
-               <text>WARNING: Due to a permissions issue accessing the log files, the status of the database has been changed to read only. 
+               <text>Warning: Due to a permissions issue accessing the log files, the status of the database has been changed to read only. 
                </text>
            </msg>
         </family>
@@ -8167,13 +8137,13 @@ Shutting down instance {0} on database d
             <title>Undocumented Replication Messages from MessageId.java</title>
             <msg>
                 <name>R001</name>
-                <text>----  BEGIN REPLICATION ERROR MESSAGE ({0}) ----</text>
+                <text>----  Begin replication error message ({0}) ----</text>
                 <arg>timestamp</arg>
             </msg>
 
             <msg>
                 <name>R002</name>
-                <text>--------------------  END REPLICATION ERROR MESSAGE ---------------------</text>
+                <text>--------------------  End replication error message ---------------------</text>
             </msg>
 
             <msg>
@@ -8262,6 +8232,7 @@ Shutting down instance {0} on database d
 # ***                Please do NOT edit this file.                 ***
 # *** CHANGING THE CONTENT OF THIS FILE MAY CAUSE DATA CORRUPTION. ***
 # ********************************************************************</text>
+                <comment>Translators: Please translate the ALL CAPS words.</comment>
             </msg>
 
             <msg>

Modified: db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java?rev=1369173&r1=1369172&r2=1369173&view=diff
==============================================================================
--- db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java (original)
+++ db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java Fri Aug  3 19:26:51 2012
@@ -1016,7 +1016,6 @@ public interface SQLState {
 	String LANG_TRIGGER_BAD_REF_CLAUSE_DUPS                            = "42Y93";
 	String LANG_BINARY_LOGICAL_NON_BOOLEAN                             = "42Y94";
 	String LANG_BINARY_OPERATOR_NOT_SUPPORTED                          = "42Y95";
-	String LANG_UNKNOWN												   = "42Y96.U";
 	String LANG_INVALID_ESCAPE										   = "42Y97";
 	String LANG_JAVA_METHOD_CALL_OR_FIELD_REF						   = "42Z00.U";
 	String LANG_UNTYPED												   = "42Z01.U";
@@ -1424,13 +1423,6 @@ public interface SQLState {
 	String LANG_DELETE_RULE_CANT_BE_CASCADE_ECYCLE					   = "XCL40.S";	
 	String LANG_DELETE_RULE_CANT_BE_CASCADE_MPATH					   = "XCL41.S";	
 
-	// referential action types
-	String LANG_DELETE_RULE_CASCADE									   = "XCL42.S";	
-	String LANG_DELETE_RULE_SETNULL									   = "XCL43.S";	
-	String LANG_DELETE_RULE_RESTRICT								   = "XCL44.S";	
-	String LANG_DELETE_RULE_NOACTION								   = "XCL45.S";	
-	String LANG_DELETE_RULE_SETDEFAULT								   = "XCL46.S";	
-
 	String LANG_STATEMENT_UPGRADE_REQUIRED							   = "XCL47.S";
 
 	//truncate table

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/LocalizedDisplay.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/LocalizedDisplay.out?rev=1369173&r1=1369172&r2=1369173&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/LocalizedDisplay.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/LocalizedDisplay.out Fri Aug  3 19:26:51 2012
@@ -42,7 +42,7 @@ ij> insert into localtab values(84.391, 
 ij> insert into localtab values(56.664, date('2000-04-16'),'15:33:40','ÏÀÍý¥í¥° 2¤¬´°Î»¤·¤Þ¤·¤¿¡£');
 1 fila insertada/actualizada/suprimida
 ij> insert into localtab values(22.393, date('2000-03-01'),'15:33;42','¥ê¥¿¡¼¥ó¥³¡¼¥É 1¤òÌᤷ¤Æ¥×¥í¥»¥¹¤¬½ªÎ»¤·¤Þ¤·¤¿:/bin/sh /bin/sh -c /work1/MOSES_7.22.UC1A5_27/sqldist/etc/log_full.sh 2 23 ÏÀÍý¥í¥° 2¤¬´°Î»¤·¤Þ¤·¤¿¡£ ÏÀÍý');
-ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
+ERROR 22007: The syntax of the string representation of a date/time value is incorrect.
 ij> insert into localtab values(90.007, date('2000-11-27'),'15:33:43','¥Á¥§¥Ã¥¯¥Ý¥¤¥ó¥È¤¬´°Î»¤·¤Þ¤·¤¿:·Ñ³»þ´Ö¤Ï 2ÉäǤ·¤¿');
 1 fila insertada/actualizada/suprimida
 ij> insert into localtab values(30.496, date('2000-04-03'),'15:34:29','ÏÀÍý¥í¥° 3¤¬´°Î»¤·¤Þ¤·¤¿¡£');

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cast.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cast.out?rev=1369173&r1=1369172&r2=1369173&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cast.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cast.out Fri Aug  3 19:26:51 2012
@@ -662,19 +662,19 @@ ij> -------------------
 --char -> date/time
 -------------------
 values (cast ('TIME''11:11:11''' as time));
-ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
+ERROR 22007: The syntax of the string representation of a date/time value is incorrect.
 ij> values (cast ('11:11:11' as time));
 1       
 --------
 11:11:11
 ij> values (cast ('DATE''1999-09-09''' as date));
-ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
+ERROR 22007: The syntax of the string representation of a date/time value is incorrect.
 ij> values (cast ('1999-09-09' as date));
 1         
 ----------
 1999-09-09
 ij> values (cast ('TIMESTAMP''1999-09-09 11:11:11''' as timestamp));
-ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
+ERROR 22007: The syntax of the string representation of a date/time value is incorrect.
 ij> values (cast ('1999-09-09 11:11:11' as timestamp));
 1                            
 -----------------------------
@@ -986,15 +986,15 @@ ERROR 42846: Cannot convert types 'CHAR'
 ij> select cast(c as date) from tab1;
 1         
 ----------
-ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
+ERROR 22007: The syntax of the string representation of a date/time value is incorrect.
 ij> select cast(c as time) from tab1;
 1       
 --------
-ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
+ERROR 22007: The syntax of the string representation of a date/time value is incorrect.
 ij> select cast(c as timestamp) from tab1;
 1                            
 -----------------------------
-ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
+ERROR 22007: The syntax of the string representation of a date/time value is incorrect.
 ij> select cast(c as dec) from tab1;
 1     
 ------
@@ -1482,11 +1482,11 @@ ij> values cast('asdf' as decimal(5,4));
 -------
 ERROR 22018: Invalid character string format for type DECIMAL.
 ij> values cast('asdf' as date);
-ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
+ERROR 22007: The syntax of the string representation of a date/time value is incorrect.
 ij> values cast('asdf' as time);
-ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
+ERROR 22007: The syntax of the string representation of a date/time value is incorrect.
 ij> values cast('asdf' as timestamp);
-ERROR 22007: The syntax of the string representation of a datetime value is incorrect.
+ERROR 22007: The syntax of the string representation of a date/time value is incorrect.
 ij> values cast('2999999999' as int);
 ERROR 22003: The resulting value is outside the range for the data type INTEGER.
 ij> values cast(2999999999 as int);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cursorerrors.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cursorerrors.out?rev=1369173&r1=1369172&r2=1369173&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cursorerrors.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cursorerrors.out Fri Aug  3 19:26:51 2012
@@ -41,7 +41,7 @@ next c1;
 ERROR 22012: Attempt to divide by zero.
 ij> -- Verify that cursor closed on error
 next c1;
-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.
 ij> close c1;
 ij> -- join #1
 get cursor c2 as 
@@ -55,7 +55,7 @@ next c2;
 ERROR 22012: Attempt to divide by zero.
 ij> -- Verify that cursor closed on error
 next c2;
-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.
 ij> close c2;
 ij> -- join #2
 get cursor c3 as 
@@ -77,7 +77,7 @@ next c3;
 ERROR 22012: Attempt to divide by zero.
 ij> -- Verify that cursor closed on error
 next c3;
-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.
 ij> close c3;
 ij> -- union all
 get cursor c4 as
@@ -91,7 +91,7 @@ next c4;
 ERROR 22012: Attempt to divide by zero.
 ij> -- Verify that cursor closed on error
 next c4;
-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.
 ij> close c4;
 ij> -- error in where clause
 -- single table
@@ -106,7 +106,7 @@ next c10;
 ERROR 22012: Attempt to divide by zero.
 ij> -- Verify that cursor closed on error
 next c10;
-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.
 ij> close c10;
 ij> -- join #1, error on open (1st row in left)
 -- (cursor will not exist after error on open)
@@ -127,7 +127,7 @@ next c13;
 ERROR 22012: Attempt to divide by zero.
 ij> -- Verify that cursor closed on error
 next c13;
-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.
 ij> close c13;
 ij> -- join #3, error on 1st row in right
 get cursor c14 as 'select * from t1 a, t1 b where b.c1 <> 1 and b.c1/b.c1 = 1';
@@ -136,7 +136,7 @@ next c14;
 ERROR 22012: Attempt to divide by zero.
 ij> -- Verify that cursor closed on error
 next c14;
-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.
 ij> close c14;
 ij> -- join #4, error on 2nd row in right
 get cursor c15 as 'select * from t1 a, t1 b where b.c1 <> 2 and b.c1/b.c1 = 1';
@@ -150,7 +150,7 @@ next c15;
 ERROR 22012: Attempt to divide by zero.
 ij> -- Verify that cursor closed on error
 next c15;
-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.
 ij> close c15;
 ij> -- union all
 get cursor c11 as 'select * from t1 where c1/c1 = 1 union all
@@ -165,7 +165,7 @@ next c11;
 ERROR 22012: Attempt to divide by zero.
 ij> -- Verify that cursor closed on error
 next c11;
-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.
 ij> close c11;
 ij> -- error in join clause
 get cursor c5 as 'select * from t1, t2 where t1.c1/t2.c1 = 1';
@@ -179,7 +179,7 @@ next c5;
 ERROR 22012: Attempt to divide by zero.
 ij> -- Verify that cursor closed on error
 next c5;
-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.
 ij> close c5;
 ij> -- error in subquery
 -- subquery in select list
@@ -195,7 +195,7 @@ next c8;
 ERROR 22012: Attempt to divide by zero.
 ij> -- Verify that cursor closed on error
 next c8;
-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.
 ij> close c8;
 ij> -- join
 get cursor c9 as 'select a.c1, (select c1/c1 from t2 where c1 = a.c1) from t1 a, t1 b
@@ -210,7 +210,7 @@ next c9;
 ERROR 22012: Attempt to divide by zero.
 ij> -- Verify that cursor closed on error
 next c9;
-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.
 ij> close c9;
 ij> -- subquery in where clause
 -- single table query
@@ -226,7 +226,7 @@ next c6;
 ERROR 22012: Attempt to divide by zero.
 ij> -- Verify that cursor closed on error
 next c6;
-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.
 ij> close c6;
 ij> -- join
 get cursor c7 as 'select * from t1 a, t1 b
@@ -242,7 +242,7 @@ next c7;
 ERROR 22012: Attempt to divide by zero.
 ij> -- Verify that cursor closed on error
 next c7;
-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.
 ij> close c7;
 ij> -- drop the tables
 drop table t1;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dbManagerLimits.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dbManagerLimits.out?rev=1369173&r1=1369172&r2=1369173&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dbManagerLimits.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dbManagerLimits.out Fri Aug  3 19:26:51 2012
@@ -44,16 +44,16 @@ Test - most elements allowed in a select
 First try a select with one column less than maximum allowed number of columns
 Next try a select with maximum allowed number of columns
 Next try a select with one column more than maximum allowed number of columns
-expected exception SELECT statement has too many items in GROUP BY, ORDER BY or select list.
+expected exception SELECT statement has too many items in GROUP BY, ORDER BY or SELECT list.
 Next try a select with 2 more columns than maximum allowed number of columns
-expected exception SELECT statement has too many items in GROUP BY, ORDER BY or select list.
+expected exception SELECT statement has too many items in GROUP BY, ORDER BY or SELECT list.
 Test - most columns allowed in a ORDER BY clause
 First try order by with one column less than maximum allowed number of columns
 Next try an order by with maximum allowed number of columns
 Next try an order by with one column more than maximum allowed number of columns
-expected exception SELECT statement has too many items in GROUP BY, ORDER BY or select list.
+expected exception SELECT statement has too many items in GROUP BY, ORDER BY or SELECT list.
 And finally try an order by with 2 more columns than maximum allowed number of columns
-expected exception SELECT statement has too many items in GROUP BY, ORDER BY or select list.
+expected exception SELECT statement has too many items in GROUP BY, ORDER BY or SELECT list.
 Test - most parameters allowed for a stored procedure
 First create a procedure with one parameter less than maximum allowed number of parameters
 Next create a procedure with maximum allowed number of parameters

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out?rev=1369173&r1=1369172&r2=1369173&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out Fri Aug  3 19:26:51 2012
@@ -6057,16 +6057,16 @@ File dblook.log was empty.
 ************
 Msg Test 3
 ************
- USAGE:
- java org.apache.derby.tools.dblook -d <sourceDBUrl> [options]
+ Usage:
+ java org.apache.derby.tools.dblook -d <source database url> [options]
  	where the source URL is the full URL, including the connection protocol
  	and any connection attributes that might apply.  For example, use
  	'jdbc:derby:myDB', or 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/myDB;user=usr;'. 
  	options include: 
- 	-z <schemaName> to specify a schema to which the DDL generation
+ 	-z <schema name> to specify a schema to which the DDL generation
  	 should be limited.  Only database objects with that schema will have
  	 their DDL generated.
- 	-t <tableOne> <tableTwo> ... to specify a list of tables for which
+ 	-t <table one> <table two> ... to specify a list of tables for which
  	 the DDL will be generated; any tables not in the list will be ignored.
  	-td <value> to specify what should be appended to the end
  	 of each DDL statement.

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test_territory.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test_territory.out?rev=1369173&r1=1369172&r2=1369173&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test_territory.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test_territory.out Fri Aug  3 19:26:51 2012
@@ -6057,16 +6057,16 @@ File dblook.log was empty.
 ************
 Msg Test 3
 ************
- USAGE:
- java org.apache.derby.tools.dblook -d <sourceDBUrl> [options]
+ Usage:
+ java org.apache.derby.tools.dblook -d <source database url> [options]
  	where the source URL is the full URL, including the connection protocol
  	and any connection attributes that might apply.  For example, use
  	'jdbc:derby:myDB', or 'jdbc:derby://xxxFILTERED_HOSTNAMExxx:1527/myDB;user=usr;'. 
  	options include: 
- 	-z <schemaName> to specify a schema to which the DDL generation
+ 	-z <schema name> to specify a schema to which the DDL generation
  	 should be limited.  Only database objects with that schema will have
  	 their DDL generated.
- 	-t <tableOne> <tableTwo> ... to specify a list of tables for which
+ 	-t <table one> <table two> ... to specify a list of tables for which
  	 the DDL will be generated; any tables not in the list will be ignored.
  	-td <value> to specify what should be appended to the end
  	 of each DDL statement.

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/depend.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/depend.out?rev=1369173&r1=1369172&r2=1369173&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/depend.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/depend.out Fri Aug  3 19:26:51 2012
@@ -181,7 +181,7 @@ C1         
 1          
 ij> close c1;
 ij> execute u1;
-ERROR 42X30: Cursor 'C1' not found. Verify that autocommit is OFF.
+ERROR 42X30: Cursor 'C1' not found. Verify that autocommit is off.
 ij> -- cleanup, roll everything back to the beginning
 rollback;
 ij> -- verify that create index invalidates based on table and
@@ -348,4 +348,4 @@ ij> DROP TABLE datamgmt.t1;
 0 rows inserted/updated/deleted
 ij> DROP SCHEMA datamgmt RESTRICT;
 0 rows inserted/updated/deleted
-ij> 
\ No newline at end of file
+ij> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out?rev=1369173&r1=1369172&r2=1369173&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out Fri Aug  3 19:26:51 2012
@@ -49,9 +49,9 @@ commit;
 ij> -- now try the fetch on cursors again after commit
 -- cursors jdk1 and jdk2 will give errors
 next jdk1;
-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.
 ij> next jdk2;
-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.
 ij> next jdk4;
 C11        |C12        
 -----------------------
@@ -90,11 +90,11 @@ rollback;
 ij> -- now try the fetch on cursors again after rollback
 -- all the cursors will give errors
 next jdk1;
-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.
 ij> next jdk2;
-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.
 ij> next jdk4;
-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.
 ij> -- clean up.
 close jdk1;
 ij> close jdk2;
@@ -193,7 +193,7 @@ C11        |C12        
 2          |23         
 ij> close jdk4;
 ij> update t1 set c12=234 where current of jdk4;
-ERROR 42X30: Cursor 'JDK4' not found. Verify that autocommit is OFF.
+ERROR 42X30: Cursor 'JDK4' not found. Verify that autocommit is off.
 ij> select * from t1;
 C11        |C12        
 -----------------------
@@ -239,7 +239,7 @@ C11        |C12        
 -----------------------
 ij> close jdk4;
 ij> delete from t1 where current of jdk4;
-ERROR 42X30: Cursor 'JDK4' not found. Verify that autocommit is OFF.
+ERROR 42X30: Cursor 'JDK4' not found. Verify that autocommit is off.
 ij> select * from t1;
 C11        |C12        
 -----------------------
@@ -301,4 +301,4 @@ ij> -- commented out for DERBY-4778
 close scrollCursor;
 ij> drop table t1;
 0 rows inserted/updated/deleted
-ij> 
\ No newline at end of file
+ij> 



Mime
View raw message