You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ka...@apache.org on 2016/04/28 09:13:54 UTC
svn commit: r1741388 - in /db/derby/code/branches/10.11: ./
java/testing/org/apache/derbyTesting/functionTests/master/LocalizedDisplay.out
java/testing/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedDisplay.sql
Author: kahatlen
Date: Thu Apr 28 07:13:54 2016
New Revision: 1741388
URL: http://svn.apache.org/viewvc?rev=1741388&view=rev
Log:
DERBY-6827: Errors in LocalizedDisplayScriptTest on jdk 9
Merged revision 1692008 from trunk.
Modified:
db/derby/code/branches/10.11/ (props changed)
db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/master/LocalizedDisplay.out
db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedDisplay.sql
Propchange: db/derby/code/branches/10.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 28 07:13:54 2016
@@ -2,4 +2,4 @@
/db/derby/code/branches/10.7:1061570,1061578,1082235
/db/derby/code/branches/10.8:1177474,1234973,1464951
/db/derby/code/branches/10.9:1373148
-/db/derby/code/trunk:1614963,1615140,1615565,1615821,1615982,1616111-1616112,1616163,1616299,1616332,1616334-1616335,1616365,1616523,1617641,1617737,1618088,1618114,1618544,1618821,1618859,1618881,1618930,1618955,1619154,1619456,1620378-1620379,1620385,1620539,1620608,1620961,1620964,1621215,1622631,1625904,1626094,1626825,1627671,1627851,1628008,1628960,1629099,1629192,1629251,1630598,1636509,1636668,1636798,1639804,1725139,1737188-1737189
+/db/derby/code/trunk:1614963,1615140,1615565,1615821,1615982,1616111-1616112,1616163,1616299,1616332,1616334-1616335,1616365,1616523,1617641,1617737,1618088,1618114,1618544,1618821,1618859,1618881,1618930,1618955,1619154,1619456,1620378-1620379,1620385,1620539,1620608,1620961,1620964,1621215,1622631,1625904,1626094,1626825,1627671,1627851,1628008,1628960,1629099,1629192,1629251,1630598,1636509,1636668,1636798,1639804,1692008,1725139,1737188-1737189
Modified: db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/master/LocalizedDisplay.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/master/LocalizedDisplay.out?rev=1741388&r1=1741387&r2=1741388&view=diff
==============================================================================
--- db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/master/LocalizedDisplay.out (original)
+++ db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/master/LocalizedDisplay.out Thu Apr 28 07:13:54 2016
@@ -74,22 +74,22 @@ NDEC |NDATEC |NTIMEC |NCHARC
11.105 |2000-07-09|15:39:10|¥Á¥§¥Ã¥¯¥Ý¥¤¥ó¥È¤¬´°Î»¤·¤Þ¤·¤¿:·Ñ³»þ´Ö¤Ï 8ÉäǤ·¤¿
ij> -- display in localized format
LOCALIZEDDISPLAY ON;
-ij> select * from localtab;
-NDEC |NDATEC |NTIMEC |NCHARC
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-12,345 |25 de mayo de 2000 |15:30:15 PST |¥¤¥Ù¥ó¥È¥¢¥é¡¼¥à¤¬Í¸ú¤Ç¤¹¡£
-32,432 |18 de mayo de 2000 |15:32:10 PST |DR:DRAUTO¤Ï0 (Off)¤Ç¤¹¡£
-54,846 |28 de enero de 2000 |15:32:28 PST |INFORMIX-OnLine¤¬½é´ü²½¤µ¤ì¡¢¥Ç¥£¥¹¥¯¤Î½é´ü²½¤¬´°Î»¤·¤Þ¤·¤¿¡£
-39,003 |11 de noviembre de 2000 |15:32:29 PST |¥Á¥§¥Ã¥¯¥Ý¥¤¥ó¥È¤¬´°Î»¤·¤Þ¤·¤¿:·Ñ³»þ´Ö¤Ï 0ÉäǤ·¤¿
-79,406 |5 de junio de 2000 |15:32:29 PST |¤¹¤Ù¤Æ¤ÎDBÎΰè¤Î¥Ç¡¼¥¿¥¹¥¥Ã¥×¤Ï¸½ºß¥ª¥Õ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
-94,999 |30 de julio de 2000 |15:32:30 PST |On-Line¥â¡¼¥É
-18,849 |22 de octubre de 2000 |15:32:31 PST |sysmaster¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºîÀ®Ãæ¤Ç¤¹...
-35,444 |29 de febrero de 2000 |15:33:22 PST |ÏÀÍý¥í¥° 1¤¬´°Î»¤·¤Þ¤·¤¿¡£
-84,391 |21 de enero de 2000 |15:33:23 PST |¥ê¥¿¡¼¥ó¥³¡¼¥É 1¤òÌᤷ¤Æ¥×¥í¥»¥¹¤¬½ªÎ»¤·¤Þ¤·¤¿:/bin/sh /bin/sh -c /work1/MOSES_7.22.UC1A5_27/sqldist/etc/log_full.sh 2 23 ÏÀÍý¥í¥° 1¤¬´°Î»¤·¤Þ¤·¤¿¡£ ÏÀÍý
-56,664 |16 de abril de 2000 |15:33:40 PST |ÏÀÍý¥í¥° 2¤¬´°Î»¤·¤Þ¤·¤¿¡£
-90,007 |27 de noviembre de 2000 |15:33:43 PST |¥Á¥§¥Ã¥¯¥Ý¥¤¥ó¥È¤¬´°Î»¤·¤Þ¤·¤¿:·Ñ³»þ´Ö¤Ï 2ÉäǤ·¤¿
-30,496 |3 de abril de 2000 |15:34:29 PST |ÏÀÍý¥í¥° 3¤¬´°Î»¤·¤Þ¤·¤¿¡£
-66,295 |15 de octubre de 2000 |15:34:30 PST |¥ê¥¿¡¼¥ó¥³¡¼¥É 1¤òÌᤷ¤Æ¥×¥í¥»¥¹¤¬½ªÎ»¤·¤Þ¤·¤¿:/bin/sh /bin/sh -c /work1/MOSES_7.22.UC1A5_27/sqldist/etc/log_full.sh 2 23 ÏÀÍý¥í¥° 3¤¬´°Î»¤·¤Þ¤·¤¿¡£ ÏÀÍý
-54,332 |1 de septiembre de 2000 |15:35:35 PST |sysmaster¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎºîÀ®¤Ï´°Î»¤·¤Þ¤·¤¿¡£
-11,105 |9 de julio de 2000 |15:39:10 PST |¥Á¥§¥Ã¥¯¥Ý¥¤¥ó¥È¤¬´°Î»¤·¤Þ¤·¤¿:·Ñ³»þ´Ö¤Ï 8ÉäǤ·¤¿
-ij>
+ij> select NDEC, NDATEC, NCHARC from localtab;
+NDEC |NDATEC |NCHARC
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------
+12,345 |25 de mayo de 2000 |¥¤¥Ù¥ó¥È¥¢¥é¡¼¥à¤¬Í¸ú¤Ç¤¹¡£
+32,432 |18 de mayo de 2000 |DR:DRAUTO¤Ï0 (Off)¤Ç¤¹¡£
+54,846 |28 de enero de 2000 |INFORMIX-OnLine¤¬½é´ü²½¤µ¤ì¡¢¥Ç¥£¥¹¥¯¤Î½é´ü²½¤¬´°Î»¤·¤Þ¤·¤¿¡£
+39,003 |11 de noviembre de 2000 |¥Á¥§¥Ã¥¯¥Ý¥¤¥ó¥È¤¬´°Î»¤·¤Þ¤·¤¿:·Ñ³»þ´Ö¤Ï 0ÉäǤ·¤¿
+79,406 |5 de junio de 2000 |¤¹¤Ù¤Æ¤ÎDBÎΰè¤Î¥Ç¡¼¥¿¥¹¥¥Ã¥×¤Ï¸½ºß¥ª¥Õ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£
+94,999 |30 de julio de 2000 |On-Line¥â¡¼¥É
+18,849 |22 de octubre de 2000 |sysmaster¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºîÀ®Ãæ¤Ç¤¹...
+35,444 |29 de febrero de 2000 |ÏÀÍý¥í¥° 1¤¬´°Î»¤·¤Þ¤·¤¿¡£
+84,391 |21 de enero de 2000 |¥ê¥¿¡¼¥ó¥³¡¼¥É 1¤òÌᤷ¤Æ¥×¥í¥»¥¹¤¬½ªÎ»¤·¤Þ¤·¤¿:/bin/sh /bin/sh -c /work1/MOSES_7.22.UC1A5_27/sqldist/etc/log_full.sh 2 23 ÏÀÍý¥í¥° 1¤¬´°Î»¤·¤Þ¤·¤¿¡£ ÏÀÍý
+56,664 |16 de abril de 2000 |ÏÀÍý¥í¥° 2¤¬´°Î»¤·¤Þ¤·¤¿¡£
+90,007 |27 de noviembre de 2000 |¥Á¥§¥Ã¥¯¥Ý¥¤¥ó¥È¤¬´°Î»¤·¤Þ¤·¤¿:·Ñ³»þ´Ö¤Ï 2ÉäǤ·¤¿
+30,496 |3 de abril de 2000 |ÏÀÍý¥í¥° 3¤¬´°Î»¤·¤Þ¤·¤¿¡£
+66,295 |15 de octubre de 2000 |¥ê¥¿¡¼¥ó¥³¡¼¥É 1¤òÌᤷ¤Æ¥×¥í¥»¥¹¤¬½ªÎ»¤·¤Þ¤·¤¿:/bin/sh /bin/sh -c /work1/MOSES_7.22.UC1A5_27/sqldist/etc/log_full.sh 2 23 ÏÀÍý¥í¥° 3¤¬´°Î»¤·¤Þ¤·¤¿¡£ ÏÀÍý
+54,332 |1 de septiembre de 2000 |sysmaster¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎºîÀ®¤Ï´°Î»¤·¤Þ¤·¤¿¡£
+11,105 |9 de julio de 2000 |¥Á¥§¥Ã¥¯¥Ý¥¤¥ó¥È¤¬´°Î»¤·¤Þ¤·¤¿:·Ñ³»þ´Ö¤Ï 8ÉäǤ·¤¿
+ij>
\ No newline at end of file
Modified: db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedDisplay.sql
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedDisplay.sql?rev=1741388&r1=1741387&r2=1741388&view=diff
==============================================================================
--- db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedDisplay.sql (original)
+++ db/derby/code/branches/10.11/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/LocalizedDisplay.sql Thu Apr 28 07:13:54 2016
@@ -41,4 +41,4 @@ select * from localtab;
-- display in localized format
LOCALIZEDDISPLAY ON;
-select * from localtab;
+select NDEC, NDATEC, NCHARC from localtab;