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 [3/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
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/outparams.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/outparams.out?rev=1369173&r1=1369172&r2=1369173&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/outparams.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/outparams.out Fri Aug  3 19:26:51 2012
@@ -1928,9 +1928,9 @@ call takesString(?,?)
 			getString(1) = true
 			getString(1) = true
 			getString(1) = true
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -1952,9 +1952,9 @@ call takesString(?,?)
 			getString(1) = true
 			getString(1) = true
 			getString(1) = true
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -1976,9 +1976,9 @@ call takesString(?,?)
 			getString(1) = 3
 			getString(1) = 3
 			getString(1) = 3
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -2000,9 +2000,9 @@ call takesString(?,?)
 			getString(1) = 3
 			getString(1) = 3
 			getString(1) = 3
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -2024,9 +2024,9 @@ call takesString(?,?)
 			getString(1) = 3
 			getString(1) = 3
 			getString(1) = 3
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -2048,9 +2048,9 @@ call takesString(?,?)
 			getString(1) = 3
 			getString(1) = 3
 			getString(1) = 3
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -2072,9 +2072,9 @@ call takesString(?,?)
 			getString(1) = 3.33
 			getString(1) = 3.33
 			getString(1) = 3.33
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getTime(1) = 03:33:00
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -2096,9 +2096,9 @@ call takesString(?,?)
 			getString(1) = 3.33
 			getString(1) = 3.33
 			getString(1) = 3.33
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getTime(1) = 03:33:00
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -2124,9 +2124,9 @@ call takesString(?,?)
 			getString(1) = 3.33
 			getString(1) = 3.33
 			getString(1) = 3.33
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getTime(1) = 03:33:00
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -2148,9 +2148,9 @@ call takesString(?,?)
 			getString(1) = 3.33
 			getString(1) = 3.33
 			getString(1) = 3.33
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getTime(1) = 03:33:00
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -2172,9 +2172,9 @@ call takesString(?,?)
 			getString(1) = I am a string
 			getString(1) = I am a string
 			getString(1) = I am a string
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -2196,9 +2196,9 @@ call takesString(?,?)
 			getString(1) = I am a string
 			getString(1) = I am a string
 			getString(1) = I am a string
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -2220,9 +2220,9 @@ call takesString(?,?)
 			getString(1) = I am a string
 			getString(1) = I am a string
 			getString(1) = I am a string
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -2245,8 +2245,8 @@ call takesString(?,?)
 			getString(1) = 1933-03-03
 			getString(1) = 1933-03-03
 			getDate(1) = 1933-03-03
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -2268,9 +2268,9 @@ call takesString(?,?)
 			getString(1) = 03:03:03
 			getString(1) = 03:03:03
 			getString(1) = 03:03:03
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getTime(1) = 03:03:03
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -2333,13 +2333,13 @@ call takesString(?,?)
 	Exception java.sql.SQLException: Parameter 1 cannot be registered to be of type DECIMAL because it maps to type DATE and they are incompatible.
 	cs.registerOutParameter(1, CHAR)
 	setString(1, "Set via setString()")
-	Exception java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+	Exception java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 	cs.registerOutParameter(1, VARCHAR)
 	setString(1, "Set via setString()")
-	Exception java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+	Exception java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 	cs.registerOutParameter(1, LONGVARCHAR)
 	setString(1, "Set via setString()")
-	Exception java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+	Exception java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 	cs.registerOutParameter(1, DATE)
 	setDate(1, Date.valueOf(1999-09-09))
 	cs.execute()
@@ -2424,13 +2424,13 @@ call takesTimestamp(?,?)
 	Exception java.sql.SQLException: Parameter 1 cannot be registered to be of type DECIMAL because it maps to type TIMESTAMP and they are incompatible.
 	cs.registerOutParameter(1, CHAR)
 	setString(1, "Set via setString()")
-	Exception java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+	Exception java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 	cs.registerOutParameter(1, VARCHAR)
 	setString(1, "Set via setString()")
-	Exception java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+	Exception java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 	cs.registerOutParameter(1, LONGVARCHAR)
 	setString(1, "Set via setString()")
-	Exception java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+	Exception java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 	cs.registerOutParameter(1, DATE)
 	setDate(1, Date.valueOf(1999-09-09))
 	cs.execute()
@@ -2515,13 +2515,13 @@ call takesTimestamp(?,?)
 	Exception java.sql.SQLException: Parameter 1 cannot be registered to be of type DECIMAL because it maps to type TIME and they are incompatible.
 	cs.registerOutParameter(1, CHAR)
 	setString(1, "Set via setString()")
-	Exception java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+	Exception java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 	cs.registerOutParameter(1, VARCHAR)
 	setString(1, "Set via setString()")
-	Exception java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+	Exception java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 	cs.registerOutParameter(1, LONGVARCHAR)
 	setString(1, "Set via setString()")
-	Exception java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+	Exception java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 	cs.registerOutParameter(1, DATE)
 	Exception java.sql.SQLException: Parameter 1 cannot be registered to be of type DATE because it maps to type TIME and they are incompatible.
 	cs.registerOutParameter(1, TIME)
@@ -4488,9 +4488,9 @@ call takesString(?,?)
 			getString(1) = true
 			getString(1) = true
 			getString(1) = true
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -4512,9 +4512,9 @@ call takesString(?,?)
 			getString(1) = true
 			getString(1) = true
 			getString(1) = true
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -4536,9 +4536,9 @@ call takesString(?,?)
 			getString(1) = 3
 			getString(1) = 3
 			getString(1) = 3
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -4560,9 +4560,9 @@ call takesString(?,?)
 			getString(1) = 3
 			getString(1) = 3
 			getString(1) = 3
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -4584,9 +4584,9 @@ call takesString(?,?)
 			getString(1) = 3
 			getString(1) = 3
 			getString(1) = 3
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -4608,9 +4608,9 @@ call takesString(?,?)
 			getString(1) = 3
 			getString(1) = 3
 			getString(1) = 3
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -4632,9 +4632,9 @@ call takesString(?,?)
 			getString(1) = 3.33
 			getString(1) = 3.33
 			getString(1) = 3.33
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getTime(1) = 03:33:00
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -4656,9 +4656,9 @@ call takesString(?,?)
 			getString(1) = 3.33
 			getString(1) = 3.33
 			getString(1) = 3.33
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getTime(1) = 03:33:00
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -4684,9 +4684,9 @@ call takesString(?,?)
 			getString(1) = 3.33
 			getString(1) = 3.33
 			getString(1) = 3.33
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getTime(1) = 03:33:00
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -4708,9 +4708,9 @@ call takesString(?,?)
 			getString(1) = 3.33
 			getString(1) = 3.33
 			getString(1) = 3.33
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getTime(1) = 03:33:00
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -4732,9 +4732,9 @@ call takesString(?,?)
 			getString(1) = I am a string
 			getString(1) = I am a string
 			getString(1) = I am a string
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -4756,9 +4756,9 @@ call takesString(?,?)
 			getString(1) = I am a string
 			getString(1) = I am a string
 			getString(1) = I am a string
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -4780,9 +4780,9 @@ call takesString(?,?)
 			getString(1) = I am a string
 			getString(1) = I am a string
 			getString(1) = I am a string
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -4805,8 +4805,8 @@ call takesString(?,?)
 			getString(1) = 1933-03-03
 			getString(1) = 1933-03-03
 			getDate(1) = 1933-03-03
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -4828,9 +4828,9 @@ call takesString(?,?)
 			getString(1) = 03:03:03
 			getString(1) = 03:03:03
 			getString(1) = 03:03:03
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getTime(1) = 03:03:03
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -4893,13 +4893,13 @@ call takesString(?,?)
 	Exception java.sql.SQLException: Parameter 1 cannot be registered to be of type DECIMAL because it maps to type DATE and they are incompatible.
 	cs.registerOutParameter(1, CHAR)
 	setObject(1, "Set via setString()")
-	Exception java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+	Exception java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 	cs.registerOutParameter(1, VARCHAR)
 	setObject(1, "Set via setString()")
-	Exception java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+	Exception java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 	cs.registerOutParameter(1, LONGVARCHAR)
 	setObject(1, "Set via setString()")
-	Exception java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+	Exception java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 	cs.registerOutParameter(1, DATE)
 	setObject(1, Date.valueOf(1999-09-09))
 	cs.execute()
@@ -4984,13 +4984,13 @@ call takesTimestamp(?,?)
 	Exception java.sql.SQLException: Parameter 1 cannot be registered to be of type DECIMAL because it maps to type TIMESTAMP and they are incompatible.
 	cs.registerOutParameter(1, CHAR)
 	setObject(1, "Set via setString()")
-	Exception java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+	Exception java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 	cs.registerOutParameter(1, VARCHAR)
 	setObject(1, "Set via setString()")
-	Exception java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+	Exception java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 	cs.registerOutParameter(1, LONGVARCHAR)
 	setObject(1, "Set via setString()")
-	Exception java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+	Exception java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 	cs.registerOutParameter(1, DATE)
 	setObject(1, Date.valueOf(1999-09-09))
 	cs.execute()
@@ -5075,13 +5075,13 @@ call takesTimestamp(?,?)
 	Exception java.sql.SQLException: Parameter 1 cannot be registered to be of type DECIMAL because it maps to type TIME and they are incompatible.
 	cs.registerOutParameter(1, CHAR)
 	setObject(1, "Set via setString()")
-	Exception java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+	Exception java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 	cs.registerOutParameter(1, VARCHAR)
 	setObject(1, "Set via setString()")
-	Exception java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+	Exception java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 	cs.registerOutParameter(1, LONGVARCHAR)
 	setObject(1, "Set via setString()")
-	Exception java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+	Exception java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 	cs.registerOutParameter(1, DATE)
 	Exception java.sql.SQLException: Parameter 1 cannot be registered to be of type DATE because it maps to type TIME and they are incompatible.
 	cs.registerOutParameter(1, TIME)
@@ -7552,9 +7552,9 @@ TESTING RETURN OUTPUT PARAMETERS
 			getString(1) = true
 			getString(1) = true
 			getString(1) = true
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -7575,9 +7575,9 @@ TESTING RETURN OUTPUT PARAMETERS
 			getString(1) = true
 			getString(1) = true
 			getString(1) = true
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -7598,9 +7598,9 @@ TESTING RETURN OUTPUT PARAMETERS
 			getString(1) = 3
 			getString(1) = 3
 			getString(1) = 3
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -7621,9 +7621,9 @@ TESTING RETURN OUTPUT PARAMETERS
 			getString(1) = 3
 			getString(1) = 3
 			getString(1) = 3
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -7644,9 +7644,9 @@ TESTING RETURN OUTPUT PARAMETERS
 			getString(1) = 3
 			getString(1) = 3
 			getString(1) = 3
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -7667,9 +7667,9 @@ TESTING RETURN OUTPUT PARAMETERS
 			getString(1) = 3
 			getString(1) = 3
 			getString(1) = 3
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -7690,9 +7690,9 @@ TESTING RETURN OUTPUT PARAMETERS
 			getString(1) = 3.33
 			getString(1) = 3.33
 			getString(1) = 3.33
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getTime(1) = 03:33:00
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -7713,9 +7713,9 @@ TESTING RETURN OUTPUT PARAMETERS
 			getString(1) = 3.33
 			getString(1) = 3.33
 			getString(1) = 3.33
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getTime(1) = 03:33:00
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -7739,9 +7739,9 @@ TESTING RETURN OUTPUT PARAMETERS
 			getString(1) = 3.33
 			getString(1) = 3.33
 			getString(1) = 3.33
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getTime(1) = 03:33:00
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -7762,9 +7762,9 @@ TESTING RETURN OUTPUT PARAMETERS
 			getString(1) = 3.33
 			getString(1) = 3.33
 			getString(1) = 3.33
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getTime(1) = 03:33:00
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -7785,9 +7785,9 @@ TESTING RETURN OUTPUT PARAMETERS
 			getString(1) = I am a string
 			getString(1) = I am a string
 			getString(1) = I am a string
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -7808,9 +7808,9 @@ TESTING RETURN OUTPUT PARAMETERS
 			getString(1) = I am a string
 			getString(1) = I am a string
 			getString(1) = I am a string
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -7831,9 +7831,9 @@ TESTING RETURN OUTPUT PARAMETERS
 			getString(1) = I am a string
 			getString(1) = I am a string
 			getString(1) = I am a string
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -7855,8 +7855,8 @@ TESTING RETURN OUTPUT PARAMETERS
 			getString(1) = 1933-03-03
 			getString(1) = 1933-03-03
 			getDate(1) = 1933-03-03
-			getTime(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getTime(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
@@ -7877,9 +7877,9 @@ TESTING RETURN OUTPUT PARAMETERS
 			getString(1) = 03:03:03
 			getString(1) = 03:03:03
 			getString(1) = 03:03:03
-			getDate(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getDate(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getTime(1) = 03:03:03
-			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a datetime value is incorrect.
+			getTimestamp(1) = java.sql.SQLException: The syntax of the string representation of a date/time value is incorrect.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.
 			getBytes(1) = java.sql.SQLException: An attempt was made to get a data value of type 'byte[]' from a data value of type 'VARCHAR'.

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/positionedDelUpd.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/positionedDelUpd.out?rev=1369173&r1=1369172&r2=1369173&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/positionedDelUpd.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/positionedDelUpd.out Fri Aug  3 19:26:51 2012
@@ -120,7 +120,7 @@ ERROR 42X23: Cursor C3 is not updatable.
 ij> close c3;
 ij> -- .target cursor does not exist
 delete from t2 where current of c44;
-ERROR 42X30: Cursor 'C44' not found. Verify that autocommit is OFF.
+ERROR 42X30: Cursor 'C44' not found. Verify that autocommit is off.
 ij> -- .target cursor after last row
 get cursor c4 as 'select * from t1 for update';
 ij> next c4;
@@ -138,7 +138,7 @@ ij> -- .target cursor exists, closed
 get cursor c5 as 'select * from t1';
 ij> close c5;
 ij> delete from t1 where current of c5;
-ERROR 42X30: Cursor 'C5' not found. Verify that autocommit is OFF.
+ERROR 42X30: Cursor 'C5' not found. Verify that autocommit is off.
 ij> -- .target cursor on row
 get cursor c6 as 'select * from t1 for update';
 ij> next c6;
@@ -487,7 +487,7 @@ ERROR 42X23: Cursor C3 is not updatable.
 ij> close c3;
 ij> -- .target cursor does not exist
 update t2 set s = s where current of c44;
-ERROR 42X30: Cursor 'C44' not found. Verify that autocommit is OFF.
+ERROR 42X30: Cursor 'C44' not found. Verify that autocommit is off.
 ij> -- .target cursor after last row
 get cursor c4 as 'select * from t1 for update';
 ij> next c4;
@@ -505,7 +505,7 @@ ij> -- .target cursor exists, closed
 get cursor c5 as 'select * from t1';
 ij> close c5;
 ij> update t1 set i = i where current of c5;
-ERROR 42X30: Cursor 'C5' not found. Verify that autocommit is OFF.
+ERROR 42X30: Cursor 'C5' not found. Verify that autocommit is off.
 ij> -- .target cursor on row
 get cursor c6 as 'select * from t1 for update';
 ij> next c6;
@@ -822,7 +822,7 @@ I          |V         
 1          |1111111111
 ij> close c17;
 ij> update t1 set v = '999' where current of c17;
-ERROR 42X30: Cursor 'C17' not found. Verify that autocommit is OFF.
+ERROR 42X30: Cursor 'C17' not found. Verify that autocommit is off.
 ij> select * from t1;
 I          |V         |D                     |T       
 ------------------------------------------------------

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/update.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/update.out?rev=1369173&r1=1369172&r2=1369173&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/update.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/update.out Fri Aug  3 19:26:51 2012
@@ -450,7 +450,7 @@ ij> execute p1;
 1 row inserted/updated/deleted
 ij> close c1;
 ij> execute p1;
-ERROR 42X30: Cursor 'C1' not found. Verify that autocommit is OFF.
+ERROR 42X30: Cursor 'C1' not found. Verify that autocommit is off.
 ij> -- clean up
 autocommit on;
 ij> drop table x;
@@ -643,4 +643,4 @@ ij> DROP TABLE DERBY10431;
 0 rows inserted/updated/deleted
 ij> DROP TABLE DERBY10432;
 0 rows inserted/updated/deleted
-ij> 
\ No newline at end of file
+ij> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java?rev=1369173&r1=1369172&r2=1369173&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java Fri Aug  3 19:26:51 2012
@@ -378,16 +378,16 @@ public class NetworkServerControlApiTest
                 "Invalid value, -12, for maxthreads.",
                 "Usage: NetworkServerControl <commands>",
                 "Commands:",
-                "start [-h <host>] [-p <portnumber>] [-noSecurityManager] [-ssl <sslmode>]",
-                "shutdown [-h <host>][-p <portnumber>] [-ssl <sslmode>] [-user <username>] [-password <password>]",
-                "ping [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "sysinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "runtimeinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "logconnections {on|off} [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "maxthreads <max>[-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "timeslice <milliseconds>[-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "trace {on|off} [-s <session id>][-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "tracedirectory <traceDirectory>[-h <host>][-p <portnumber>] [-ssl <sslmode>]",
+                "start [-h <host>] [-p <port number>] [-noSecurityManager] [-ssl <ssl mode>]",
+                "shutdown [-h <host>][-p <port number>] [-ssl <ssl mode>] [-user <username>] [-password <password>]",
+                "ping [-h <host>][-p <port number>] [-ssl <ssl mode>]",
+                "sysinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
+                "runtimeinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
+                "logconnections {on|off} [-h <host>][-p <port number>] [-ssl <ssl mode>]",
+                "maxthreads <max>[-h <host>][-p <port number>] [-ssl <ssl mode>]",
+                "timeslice <milliseconds>[-h <host>][-p <port number>] [-ssl <ssl mode>]",
+                "trace {on|off} [-s <session id>][-h <host>][-p <port number>] [-ssl <ssl mode>]",
+                "tracedirectory <trace directory>[-h <host>][-p <port number>] [-ssl <ssl mode>]",
         }, maxthreadsCmd3, 1);
         int maxValue = server.getMaxThreads();
         assertEquals("Fail! Max threads value incorrect!", 0, maxValue);
@@ -428,16 +428,16 @@ public class NetworkServerControlApiTest
         assertExecJavaCmdAsExpected(new String[]{"Invalid value, a, for maxthreads.",
                 "Usage: NetworkServerControl <commands>",
                 "Commands:",
-                "start [-h <host>] [-p <portnumber>] [-noSecurityManager] [-ssl <sslmode>]",
-                "shutdown [-h <host>][-p <portnumber>] [-ssl <sslmode>] [-user <username>] [-password <password>]",
-                "ping [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "sysinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "runtimeinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "logconnections {on|off} [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "maxthreads <max>[-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "timeslice <milliseconds>[-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "trace {on|off} [-s <session id>][-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "tracedirectory <traceDirectory>[-h <host>][-p <portnumber>] [-ssl <sslmode>]",}, maxthreadsCmd6, 1);
+                "start [-h <host>] [-p <port number>] [-noSecurityManager] [-ssl <ssl mode>]",
+                "shutdown [-h <host>][-p <port number>] [-ssl <ssl mode>] [-user <username>] [-password <password>]",
+                "ping [-h <host>][-p <port number>] [-ssl <ssl mode>]",
+                "sysinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
+                "runtimeinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
+                "logconnections {on|off} [-h <host>][-p <port number>] [-ssl <ssl mode>]",
+                "maxthreads <max>[-h <host>][-p <port number>] [-ssl <ssl mode>]",
+                "timeslice <milliseconds>[-h <host>][-p <port number>] [-ssl <ssl mode>]",
+                "trace {on|off} [-s <session id>][-h <host>][-p <port number>] [-ssl <ssl mode>]",
+                "tracedirectory <trace directory>[-h <host>][-p <port number>] [-ssl <ssl mode>]",}, maxthreadsCmd6, 1);
 
 
         maxValue = server.getMaxThreads();
@@ -517,16 +517,16 @@ public class NetworkServerControlApiTest
         assertExecJavaCmdAsExpected(new String[]{"Invalid value, -12, for timeslice.",
                 "Usage: NetworkServerControl <commands> ",
                 "Commands:",
-                "start [-h <host>] [-p <portnumber>] [-noSecurityManager] [-ssl <sslmode>]",
-                "shutdown [-h <host>][-p <portnumber>] [-ssl <sslmode>] [-user <username>] [-password <password>]",
-                "ping [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "sysinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "runtimeinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "logconnections {on|off} [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "maxthreads <max>[-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "timeslice <milliseconds>[-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "trace {on|off} [-s <session id>][-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "tracedirectory <traceDirectory>[-h <host>][-p <portnumber>] [-ssl <sslmode>]"}, timesliceCmd3, 1);
+                "start [-h <host>] [-p <port number>] [-noSecurityManager] [-ssl <ssl mode>]",
+                "shutdown [-h <host>][-p <port number>] [-ssl <ssl mode>] [-user <username>] [-password <password>]",
+                "ping [-h <host>][-p <port number>] [-ssl <ssl mode>]",
+                "sysinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
+                "runtimeinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
+                "logconnections {on|off} [-h <host>][-p <port number>] [-ssl <ssl mode>]",
+                "maxthreads <max>[-h <host>][-p <port number>] [-ssl <ssl mode>]",
+                "timeslice <milliseconds>[-h <host>][-p <port number>] [-ssl <ssl mode>]",
+                "trace {on|off} [-s <session id>][-h <host>][-p <port number>] [-ssl <ssl mode>]",
+                "tracedirectory <trace directory>[-h <host>][-p <port number>] [-ssl <ssl mode>]"}, timesliceCmd3, 1);
         int timeSliceValue = server.getTimeSlice();
         assertEquals(value, timeSliceValue);
     }
@@ -564,16 +564,16 @@ public class NetworkServerControlApiTest
         assertExecJavaCmdAsExpected(new String[]{"Invalid value, a, for timeslice.",
                 "Usage: NetworkServerControl <commands> ",
                 "Commands:",
-                "start [-h <host>] [-p <portnumber>] [-noSecurityManager] [-ssl <sslmode>]",
-                "shutdown [-h <host>][-p <portnumber>] [-ssl <sslmode>] [-user <username>] [-password <password>]",
-                "ping [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "sysinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "runtimeinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "logconnections {on|off} [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "maxthreads <max>[-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "timeslice <milliseconds>[-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "trace {on|off} [-s <session id>][-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "tracedirectory <traceDirectory>[-h <host>][-p <portnumber>] [-ssl <sslmode>]"}, timesliceCmd6, 1);
+                "start [-h <host>] [-p <port number>] [-noSecurityManager] [-ssl <ssl mode>]",
+                "shutdown [-h <host>][-p <port number>] [-ssl <ssl mode>] [-user <username>] [-password <password>]",
+                "ping [-h <host>][-p <port number>] [-ssl <ssl mode>]",
+                "sysinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
+                "runtimeinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
+                "logconnections {on|off} [-h <host>][-p <port number>] [-ssl <ssl mode>]",
+                "maxthreads <max>[-h <host>][-p <port number>] [-ssl <ssl mode>]",
+                "timeslice <milliseconds>[-h <host>][-p <port number>] [-ssl <ssl mode>]",
+                "trace {on|off} [-s <session id>][-h <host>][-p <port number>] [-ssl <ssl mode>]",
+                "tracedirectory <trace directory>[-h <host>][-p <port number>] [-ssl <ssl mode>]"}, timesliceCmd6, 1);
         timeSliceValue = server.getTimeSlice();
         assertEquals(value, timeSliceValue);
     }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java?rev=1369173&r1=1369172&r2=1369173&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java Fri Aug  3 19:26:51 2012
@@ -207,8 +207,8 @@ public final class ErrorCodeTest extends
         		{"XSDB4","Page {0} is at version {1}, the log file contains change version {2}, either there are log records of this page missing, or this page did not get written out to disk properly.","45000"},
         		{"XSDB5","Log has change record on page {0}, which is beyond the end of the container.","45000"},
         		{"XSDB6","Another instance of Derby may have already booted the database {0}.","45000"},
-        		{"XSDB7","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.","45000"},
-        		{"XSDB8","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.","45000"},
+        		{"XSDB7","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.","45000"},
+        		{"XSDB8","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.","45000"},
         		{"XSDB9","Stream container {0} is corrupt.","45000"},
         		{"XSDBA","Attempt to allocate object {0} failed.","45000"},
         		{"XSDBB", "Unknown page format at page {0}, page dump follows: {1} ", "45000"},
@@ -258,7 +258,7 @@ public final class ErrorCodeTest extends
                 {"XXXXX","Normal database session close.","40000"},
                 {"XRE04","Could not establish a connection to the peer of the replicated database '{0}' on address '{1}:{2}'.","40000"},
                 {"XRE04","Connection lost for replicated database '{0}'.","40000"},
-                {"XRE05","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.","40000"},
+                {"XRE05","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.","40000"},
                 {"XRE09","Cannot start replication slave mode for database '{0}'. The database has already been booted.","40000"},
                 {"XRE11","Could not perform operation '{0}' because the database '{1}' has not been booted.","40000"},
                 {"XRE21","Error occurred while performing failover for database '{0}', Failover attempt was aborted.","40000"},

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java?rev=1369173&r1=1369172&r2=1369173&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java Fri Aug  3 19:26:51 2012
@@ -76,7 +76,7 @@ public class SysinfoCPCheckTest extends 
      *  Test Classpath Checker output for 3 supported variations
      */
     public void testClassPathChecker() throws IOException {
-        String Success = "SUCCESS: All Derby related classes found in class path.";
+        String Success = "Success: All Derby related classes found in class path.";
         // for testing the -cp with valid class
         String thisclass = "org.apache.derbyTesting.functionTests.tests.tools." +
         "SysinfoCPCheckTest.class";
@@ -96,7 +96,7 @@ public class SysinfoCPCheckTest extends 
                 {
                         "a",
                         "0",
-                        "USAGE: java org.apache.derby.tools.sysinfo -cp ["
+                        "Usage: java org.apache.derby.tools.sysinfo -cp ["
                                 + " [ embedded ][ server ][ client] [ tools ]"
                                 + " [ anyClass.class ] ]", null },
                 {"embedded", "6", Success, "derby.jar"}, 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java?rev=1369173&r1=1369172&r2=1369173&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java Fri Aug  3 19:26:51 2012
@@ -105,7 +105,7 @@ public class derbyrunjartest extends Bas
     public void testSysinfo() throws Exception {
         String[] cmd = { "sysinfo", "-cp", "help" };
         String[] output = {
-            "USAGE: java org.apache.derby.tools.sysinfo -cp [ [ embedded ][ server ][ client] [ tools ] [ anyClass.class ] ]"
+            "Usage: java org.apache.derby.tools.sysinfo -cp [ [ embedded ][ server ][ client] [ tools ] [ anyClass.class ] ]"
         };
         runtool(cmd, output, 0);
     }
@@ -113,15 +113,15 @@ public class derbyrunjartest extends Bas
     public void testDblook() throws Exception {
         String[] cmd = { "dblook" };
         String[] output = {
-            " 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",
             " 	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.",
@@ -143,16 +143,16 @@ public class derbyrunjartest extends Bas
         String[] output = {
             "Usage: NetworkServerControl <commands> ",
             "Commands:",
-            "start [-h <host>] [-p <portnumber>] [-noSecurityManager] [-ssl <sslmode>]",
-            "shutdown [-h <host>][-p <portnumber>] [-ssl <sslmode>] [-user <username>] [-password <password>]",
-            "ping [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-            "sysinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-            "runtimeinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-            "logconnections {on|off} [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-            "maxthreads <max>[-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-            "timeslice <milliseconds>[-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-            "trace {on|off} [-s <session id>][-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-            "tracedirectory <traceDirectory>[-h <host>][-p <portnumber>] [-ssl <sslmode>]",
+            "start [-h <host>] [-p <port number>] [-noSecurityManager] [-ssl <ssl mode>]",
+            "shutdown [-h <host>][-p <port number>] [-ssl <ssl mode>] [-user <username>] [-password <password>]",
+            "ping [-h <host>][-p <port number>] [-ssl <ssl mode>]",
+            "sysinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
+            "runtimeinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
+            "logconnections {on|off} [-h <host>][-p <port number>] [-ssl <ssl mode>]",
+            "maxthreads <max>[-h <host>][-p <port number>] [-ssl <ssl mode>]",
+            "timeslice <milliseconds>[-h <host>][-p <port number>] [-ssl <ssl mode>]",
+            "trace {on|off} [-s <session id>][-h <host>][-p <port number>] [-ssl <ssl mode>]",
+            "tracedirectory <trace directory>[-h <host>][-p <port number>] [-ssl <ssl mode>]",
         };
         runtool(cmd, output, 1);
     }

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/xaHelper.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/xaHelper.java?rev=1369173&r1=1369172&r2=1369173&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/xaHelper.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/xaHelper.java Fri Aug  3 19:26:51 2012
@@ -498,7 +498,7 @@ class xaHelper implements xaAbstractHelp
 	public void CPDisconnectStatement(ij parser, String n) throws SQLException
 	{
 		if (currentPooledConnection == null)
-			throw ijException.noSuchConnection(LocalizedResource.getMessage("IJ_Pool"));
+			throw ijException.noSuchConnection(LocalizedResource.getMessage("PooledConnection"));
 		currentPooledConnection.close();
 		currentPooledConnection = null;
 	}

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java?rev=1369173&r1=1369172&r2=1369173&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java Fri Aug  3 19:26:51 2012
@@ -68,8 +68,7 @@ import org.apache.derby.iapi.tools.i18n.
   the info properties files from the directory or jar locations on the
   classpath, and eliminates any duplicated information. If no files
   are found, or some other exception occurs, the
-  value returned will be that set for the key
-  SysInfo.failureTag, or be the value "<info unavailable>".
+  value returned will be "<info unavailable>".
 
   <P>
   This class can be used to print out system information at the
@@ -405,13 +404,6 @@ public static void getMainInfo (java.io.
 
   private final static String curLoc  = Main.getTextMessage ("SIF01.T");
 
-  /**
-    The name of the failure tag in the information file.
-    The failure tag's value provides a default value if
-    any other properties are missing.
-   */
-  private final static String failureTag = Main.getTextMessage ("SIF01.J");
-
   private static void getClasspathInfo (String args[], java.io.PrintWriter aw) {
 
     Main.useMe (args, aw);

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages.properties?rev=1369173&r1=1369172&r2=1369173&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages.properties Fri Aug  3 19:26:51 2012
@@ -25,7 +25,6 @@ SIF01.C=Press <return> to continue
 SIF01.D=No Derby System info found!
 SIF01.H=<info unavailable>
 SIF01.I=Security Exception: {0}
-SIF01.J=FailedUpdate
 SIF01.K=<no name found>
 SIF01.L=------------------ Java Information ------------------
 SIF01.M=--------- Derby Information --------
@@ -61,16 +60,18 @@ SIF04.C=<null>
 # ClasspathTester messages are SIF08
 SIF08.B=Testing for presence of all Derby-related libraries; typically, only some are needed.
 SIF08.C=For a list of possible arguments, type {0}
-SIF08.D=FOUND IN CLASS PATH:
-SIF08.E=NOT FOUND IN CLASS PATH:
-SIF08.F=SUCCESS: All Derby related classes found in class path.
+SIF08.D=Found in Classpath:
+SIF08.E=Not found in Classpath:
+SIF08.F=Success: All Derby related classes found in class path.
 SIF08.H=user-specified class ({0})
 SIF08.I=Derby Network Server library ({0})
 SIF08.J=Derby embedded engine library ({0})
 SIF08.L=Derby Client libraries ({0})
 SIF08.Q=Derby tools library ({0})
 SIF08.U=({0} not found.)
-SIF08.A=USAGE: {0} anyClass{1}
+
+# Translators: Please translate anyClass even though it is camel-case. Do NOT insert a space after anyClass.
+SIF08.A=Usage: {0} anyClass{1}
 
 
 



Mime
View raw message