db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r1465861 [1/2] - in /db/derby/code/branches/10.8.3.1_testcompat: ./ java/testing/org/apache/derbyTesting/functionTests/master/ java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/ java/testing/org/apache/derbyTesting/functionT...
Date Tue, 09 Apr 2013 02:17:55 GMT
Author: kmarsden
Date: Tue Apr  9 02:17:54 2013
New Revision: 1465861

URL: http://svn.apache.org/r1465861
Log:
DERBY-5852 DERBY-5879 Message updates for localization
partial (mine-conflict) merge 1421972 1369173 


Modified:
    db/derby/code/branches/10.8.3.1_testcompat/   (props changed)
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/LocalizedDisplay.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/cast.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/cursorerrors.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/dbManagerLimits.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test_territory.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/depend.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/ij.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/implicitConversions.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/importExportIJ.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/nestedCommit.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/outparams.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/positionedDelUpd.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/update.out
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java
    db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/tests/tools/SysinfoCPCheckTest.java

Propchange: db/derby/code/branches/10.8.3.1_testcompat/
------------------------------------------------------------------------------
  Merged /db/derby/code/trunk:r1369173,1421972

Modified: db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/LocalizedDisplay.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/LocalizedDisplay.out?rev=1465861&r1=1465860&r2=1465861&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/LocalizedDisplay.out (original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/LocalizedDisplay.out Tue Apr  9 02:17:54 2013
@@ -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/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/cast.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/cast.out?rev=1465861&r1=1465860&r2=1465861&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/cast.out (original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/cast.out Tue Apr  9 02:17:54 2013
@@ -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/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/cursorerrors.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/cursorerrors.out?rev=1465861&r1=1465860&r2=1465861&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/cursorerrors.out (original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/cursorerrors.out Tue Apr  9 02:17:54 2013
@@ -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/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/dbManagerLimits.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/dbManagerLimits.out?rev=1465861&r1=1465860&r2=1465861&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/dbManagerLimits.out (original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/dbManagerLimits.out Tue Apr  9 02:17:54 2013
@@ -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/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out?rev=1465861&r1=1465860&r2=1465861&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out (original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out Tue Apr  9 02:17:54 2013
@@ -6063,10 +6063,10 @@ Msg Test 3
  	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/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test_territory.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test_territory.out?rev=1465861&r1=1465860&r2=1465861&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test_territory.out (original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test_territory.out Tue Apr  9 02:17:54 2013
@@ -6063,10 +6063,10 @@ Msg Test 3
  	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/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/depend.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/depend.out?rev=1465861&r1=1465860&r2=1465861&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/depend.out (original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/depend.out Tue Apr  9 02:17:54 2013
@@ -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/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out?rev=1465861&r1=1465860&r2=1465861&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out (original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out Tue Apr  9 02:17:54 2013
@@ -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> 

Modified: db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/ij.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/ij.out?rev=1465861&r1=1465860&r2=1465861&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/ij.out (original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/ij.out Tue Apr  9 02:17:54 2013
@@ -104,7 +104,7 @@ help;
                                -- each column to integerValue
   ASYNC name 'SQL-J text';     -- run the command in another thread
   WAIT FOR name;               -- wait for result of ASYNC'd command
-  GET [SCROLL INSENSITIVE] [WITH  {HOLD | NOHOLD}] CURSOR name AS 'SQL-J query';
+  GET [SCROLL INSENSITIVE] [WITH  { HOLD | NOHOLD }] CURSOR name AS 'SQL-J query';
                                -- gets a cursor (JDBC result set) on the query
                                -- the default is a forward-only cursor with holdability
   NEXT name;                   -- gets the next row from the named cursor

Modified: db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/implicitConversions.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/implicitConversions.out?rev=1465861&r1=1465860&r2=1465861&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/implicitConversions.out (original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/implicitConversions.out Tue Apr  9 02:17:54 2013
@@ -2620,29 +2620,29 @@ ij> values date('1996-09-09'), 'a';
 1         
 ----------
 1996-09-09
-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 'a', date('1996-09-09');
 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> values time('11:11:11'), 'a';
 1       
 --------
 11:11:11
-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 'a', time('11:11:11');
 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> values timestamp('1996-09-09 11:11:11.5'), 'a';
 1                            
 -----------------------------
 1996-09-09 11:11:11.5        
-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 'a', timestamp('1996-09-09 11:11:11.5');
 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> -- comparisons at the language level
 select si from all1 where cast(1 as smallint) = 'a';
 ERROR 42818: Comparisons between 'SMALLINT' and 'CHAR (UCS_BASIC)' are not supported. Types must be comparable. String types must also have matching collation. If collation does not match, a possible solution is to cast operands to force them to the default collation (e.g. SELECT tablename FROM sys.systables WHERE CAST(tablename AS VARCHAR(128)) = 'T1')
@@ -2861,77 +2861,77 @@ ERROR 42818: Comparisons between 'CHAR (
 ij> select si from all1 where 'a' <> 1.1;
 ERROR 42818: Comparisons between 'CHAR (UCS_BASIC)' and 'DECIMAL' are not supported. Types must be comparable. String types must also have matching collation. If collation does not match, a possible solution is to cast operands to force them to the default collation (e.g. SELECT tablename FROM sys.systables WHERE CAST(tablename AS VARCHAR(128)) = 'T1')
 ij> select si from all1 where date('1996-09-09') = 'a';
-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 si from all1 where date('1996-09-09') > 'a';
-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 si from all1 where date('1996-09-09') >= 'a';
-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 si from all1 where date('1996-09-09') < 'a';
-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 si from all1 where date('1996-09-09') <= 'a';
-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 si from all1 where date('1996-09-09') <> 'a';
-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 si from all1 where 'a' = date('1996-09-09');
-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 si from all1 where 'a' > date('1996-09-09');
-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 si from all1 where 'a' >= date('1996-09-09');
-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 si from all1 where 'a' < date('1996-09-09');
-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 si from all1 where 'a' <= date('1996-09-09');
-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 si from all1 where 'a' <> date('1996-09-09');
-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 si from all1 where time('11:11:11') = 'a';
-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 si from all1 where time('11:11:11') > 'a';
-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 si from all1 where time('11:11:11') >= 'a';
-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 si from all1 where time('11:11:11') < 'a';
-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 si from all1 where time('11:11:11') <= 'a';
-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 si from all1 where time('11:11:11') <> 'a';
-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 si from all1 where 'a' = time('11:11:11');
-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 si from all1 where 'a' > time('11:11:11');
-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 si from all1 where 'a' >= time('11:11:11');
-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 si from all1 where 'a' < time('11:11:11');
-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 si from all1 where 'a' <= time('11:11:11');
-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 si from all1 where 'a' <> time('11:11:11');
-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 si from all1 where timestamp('1996-09-09 11:11:11.4' )= 'a';
-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 si from all1 where timestamp('1996-09-09 11:11:11.4' )> 'a';
-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 si from all1 where timestamp('1996-09-09 11:11:11.4' )>= 'a';
-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 si from all1 where timestamp('1996-09-09 11:11:11.4' )< 'a';
-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 si from all1 where timestamp('1996-09-09 11:11:11.4' )<= 'a';
-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 si from all1 where timestamp('1996-09-09 11:11:11.4' )<> 'a';
-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 si from all1 where 'a' = timestamp('1996-09-09 11:11:11.4');
-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 si from all1 where 'a' > timestamp('1996-09-09 11:11:11.4');
-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 si from all1 where 'a' >= timestamp('1996-09-09 11:11:11.4');
-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 si from all1 where 'a' < timestamp('1996-09-09 11:11:11.4');
-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 si from all1 where 'a' <= timestamp('1996-09-09 11:11:11.4');
-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 si from all1 where 'a' <> timestamp('1996-09-09 11:11:11.4');
-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> -- create an all types table
 drop table all1;
 0 rows inserted/updated/deleted
@@ -3193,147 +3193,147 @@ ERROR 42818: Comparisons between 'CHAR (
 ij> select 1 from all1 where dt = 'a';
 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 1 from all1 where dt > 'a';
 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 1 from all1 where dt >= 'a';
 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 1 from all1 where dt < 'a';
 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 1 from all1 where dt <= 'a';
 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 1 from all1 where dt <> 'a';
 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 1 from all1 where 'a' = dt;
 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 1 from all1 where 'a' > dt;
 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 1 from all1 where 'a' >= dt;
 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 1 from all1 where 'a' < dt;
 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 1 from all1 where 'a' <= dt;
 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 1 from all1 where 'a' <> dt;
 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 1 from all1 where tm = 'a';
 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 1 from all1 where tm > 'a';
 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 1 from all1 where tm >= 'a';
 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 1 from all1 where tm < 'a';
 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 1 from all1 where tm <= 'a';
 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 1 from all1 where tm <> 'a';
 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 1 from all1 where 'a' = tm;
 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 1 from all1 where 'a' > tm;
 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 1 from all1 where 'a' >= tm;
 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 1 from all1 where 'a' < tm;
 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 1 from all1 where 'a' <= tm;
 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 1 from all1 where 'a' <> tm;
 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 1 from all1 where tms = 'a';
 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 1 from all1 where tms > 'a';
 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 1 from all1 where tms >= 'a';
 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 1 from all1 where tms < 'a';
 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 1 from all1 where tms <= 'a';
 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 1 from all1 where tms <> 'a';
 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 1 from all1 where 'a' = tms;
 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 1 from all1 where 'a' > tms;
 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 1 from all1 where 'a' >= tms;
 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 1 from all1 where 'a' < tms;
 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 1 from all1 where 'a' <= tms;
 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 1 from all1 where 'a' <> tms;
 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> autocommit off;
 ij> -- test start and stop positions for conversions to (var)char
 create index all1_si on all1(si);
@@ -3565,123 +3565,123 @@ ERROR 42818: Comparisons between 'CHAR (
 ij> select 1 from all1 where dt = 'a';
 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 1 from all1 where dt > 'a';
 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 1 from all1 where dt >= 'a';
 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 1 from all1 where dt < 'a';
 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 1 from all1 where dt <= 'a';
 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 1 from all1 where 'a' = dt;
 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 1 from all1 where 'a' > dt;
 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 1 from all1 where 'a' >= dt;
 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 1 from all1 where 'a' < dt;
 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 1 from all1 where 'a' <= dt;
 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 1 from all1 where tm = 'a';
 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 1 from all1 where tm > 'a';
 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 1 from all1 where tm >= 'a';
 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 1 from all1 where tm < 'a';
 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 1 from all1 where tm <= 'a';
 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 1 from all1 where 'a' = tm;
 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 1 from all1 where 'a' > tm;
 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 1 from all1 where 'a' >= tm;
 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 1 from all1 where 'a' < tm;
 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 1 from all1 where 'a' <= tm;
 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 1 from all1 where tms = 'a';
 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 1 from all1 where tms > 'a';
 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 1 from all1 where tms >= 'a';
 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 1 from all1 where tms < 'a';
 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 1 from all1 where tms <= 'a';
 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 1 from all1 where 'a' = tms;
 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 1 from all1 where 'a' > tms;
 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 1 from all1 where 'a' >= tms;
 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 1 from all1 where 'a' < tms;
 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 1 from all1 where 'a' <= tms;
 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> rollback;
 ij> -- insert tests
 insert into all1(si) values 'a';
@@ -3705,11 +3705,11 @@ ERROR 42821: Columns of type 'DECIMAL' c
 ij> insert into all1(num) values 'a';
 ERROR 42821: Columns of type 'NUMERIC' cannot hold values of type 'CHAR'. 
 ij> insert into all1(dt) values 'a';
-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 all1(tm) values 'a';
-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 all1(tms) values 'a';
-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> -- update tests
 update all1 set si = 'a';
 ERROR 42821: Columns of type 'SMALLINT' cannot hold values of type 'CHAR'. 
@@ -3732,11 +3732,11 @@ ERROR 42821: Columns of type 'DECIMAL' c
 ij> update all1 set num = 'a';
 ERROR 42821: Columns of type 'NUMERIC' cannot hold values of type 'CHAR'. 
 ij> update all1 set dt = 'a';
-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> update all1 set tm = 'a';
-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> update all1 set tms = 'a';
-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> rollback;
 ij> -- arithmetic
 -- arithmetic on 2 non-numeric strings
@@ -3773,27 +3773,27 @@ ij> -- extract
 values year( '1');
 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> values month( '1');
 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> values day( '1');
 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> values hour( '1');
 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> values minute( '1');
 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> values second( '1');
 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> -- string does not match default
 -- date for year/month/day
 -- time for hour/minute/second
@@ -3804,7 +3804,7 @@ values year( '1996-09-10 10:11:12.5');
 ij> values year( '10:11:12.5');
 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> values month( '1996-09-10 10:11:12.5');
 1          
 -----------
@@ -3812,7 +3812,7 @@ ij> values month( '1996-09-10 10:11:12.5
 ij> values month( '10:11:12.5');
 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> values day( '1996-09-10 10:11:12.5');
 1          
 -----------
@@ -3820,7 +3820,7 @@ ij> values day( '1996-09-10 10:11:12.5')
 ij> values day( '10:11:12.5');
 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> values hour( '1996-09-10 10:11:12.5');
 1          
 -----------
@@ -3828,7 +3828,7 @@ ij> values hour( '1996-09-10 10:11:12.5'
 ij> values hour( '1996-09-10');
 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> values minute( '1996-09-10 10:11:12.5');
 1          
 -----------
@@ -3836,7 +3836,7 @@ ij> values minute( '1996-09-10 10:11:12.
 ij> values minute( '1996-09-10');
 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> values second( '1996-09-10 10:11:12.5');
 1          
 -----------
@@ -3844,7 +3844,7 @@ ij> values second( '1996-09-10 10:11:12.
 ij> values second( '1996-09-10');
 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> -- sum and avg not supported on string types
 select sum('1') from all1;
 ERROR 42Y22: Aggregate SUM cannot operate on type CHAR.
@@ -3873,12 +3873,12 @@ ij> select * from all1 a, all1 b 
 where a.dt = b.c;
 SI    |I          |LI                  |R            |DP                    |DC     |NUM    |B   |BV  |LBV                                                                                                                             |DT        |TM      |TMS                          |C   |VC  |LVC                                                                                                                             |SI    |I          |LI                  |R            |DP                    |DC     |NUM    |B   |BV  |LBV                                                                                                                             |DT        |TM      |TMS                          |C   |VC  |LVC                                                                                                                             
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-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 * from all1 a, all1 b 
 where a.dt = b.vc;
 SI    |I          |LI                  |R            |DP                    |DC     |NUM    |B   |BV  |LBV                                                                                                                             |DT        |TM      |TMS                          |C   |VC  |LVC                                                                                                                             |SI    |I          |LI                  |R            |DP                    |DC     |NUM    |B   |BV  |LBV                                                                                                                             |DT        |TM      |TMS                          |C   |VC  |LVC                                                                                                                             
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-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 * from all1 a, all1 b 
 where a.dt = b.lvc;
 ERROR 42818: Comparisons between 'DATE' and 'LONG VARCHAR (UCS_BASIC)' are not supported. Types must be comparable. String types must also have matching collation. If collation does not match, a possible solution is to cast operands to force them to the default collation (e.g. SELECT tablename FROM sys.systables WHERE CAST(tablename AS VARCHAR(128)) = 'T1')
@@ -3886,12 +3886,12 @@ ij> select * from all1 a, all1 b 
 where b.dt = a.c;
 SI    |I          |LI                  |R            |DP                    |DC     |NUM    |B   |BV  |LBV                                                                                                                             |DT        |TM      |TMS                          |C   |VC  |LVC                                                                                                                             |SI    |I          |LI                  |R            |DP                    |DC     |NUM    |B   |BV  |LBV                                                                                                                             |DT        |TM      |TMS                          |C   |VC  |LVC                                                                                                                             
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-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 * from all1 a, all1 b 
 where b.dt = a.vc;
 SI    |I          |LI                  |R            |DP                    |DC     |NUM    |B   |BV  |LBV                                                                                                                             |DT        |TM      |TMS                          |C   |VC  |LVC                                                                                                                             |SI    |I          |LI                  |R            |DP                    |DC     |NUM    |B   |BV  |LBV                                                                                                                             |DT        |TM      |TMS                          |C   |VC  |LVC                                                                                                                             
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-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 * from all1 a, all1 b 
 where b.dt = a.lvc;
 ERROR 42818: Comparisons between 'DATE' and 'LONG VARCHAR (UCS_BASIC)' are not supported. Types must be comparable. String types must also have matching collation. If collation does not match, a possible solution is to cast operands to force them to the default collation (e.g. SELECT tablename FROM sys.systables WHERE CAST(tablename AS VARCHAR(128)) = 'T1')

Modified: db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/importExportIJ.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/importExportIJ.out?rev=1465861&r1=1465860&r2=1465861&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/importExportIJ.out (original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/importExportIJ.out Tue Apr  9 02:17:54 2013
@@ -50,8 +50,8 @@ ij> create index T1_IndexLname on T1 (Ln
 ij> -- second line of data file is not complete - should give error message re EOF
 call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'T1' , 'extin/TwoLineBadEOF.dat' , 
                                     null, null, null, 0) ;
-ERROR XIE0R: Import error on line 2 of file extin/TwoLineBadEOF.dat: Read endOfFile at unexpected place on line 2. 
-ERROR XIE0E: Read endOfFile at unexpected place on line 2.
+ERROR XIE0R: Import error on line 2 of file extin/TwoLineBadEOF.dat: Read end of file at unexpected place on line 2. 
+ERROR XIE0E: Read end of file at unexpected place on line 2.
 ij> -- should work, default format (i.e. field sep , column delimiter ".)
 -- (last two lines have extra white space (tabs, spaces) which should not matter).
 call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'T1' , 'extin/AccountData_defaultformat.dat' , 
@@ -864,4 +864,4 @@ ERROR XIE0T: The export operation was no
 ij> --
 -- end test case for derby-2925:
 ;
-ij> 
\ No newline at end of file
+ij> 

Modified: db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/nestedCommit.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/nestedCommit.out?rev=1465861&r1=1465860&r2=1465861&view=diff
==============================================================================
--- db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/nestedCommit.out (original)
+++ db/derby/code/branches/10.8.3.1_testcompat/java/testing/org/apache/derbyTesting/functionTests/master/nestedCommit.out Tue Apr  9 02:17:54 2013
@@ -69,7 +69,7 @@ ij> -- call doConnStmt('call doConnStmt(
 values doConnCommitInt();
 1          
 -----------
-ERROR XCL16: ResultSet not open. Operation 'getString' not permitted. Verify that autocommit is OFF.
+ERROR XCL16: ResultSet not open. Operation 'getString' not permitted. Verify that autocommit is off.
 ij> -- values doConnStmtInt('commit');
 -- values doConnStmtInt('rollback');
 -- values doConnStmtInt('call doConnStmt(''call doConnStmt(''''commit'''')'')');



Mime
View raw message