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 da...@apache.org on 2007/10/30 12:48:29 UTC
svn commit: r590046 - in /db/derby/code/trunk/java:
engine/org/apache/derby/loc/ shared/org/apache/derby/shared/common/reference/
testing/org/apache/derbyTesting/functionTests/util/
Author: dag
Date: Tue Oct 30 04:48:20 2007
New Revision: 590046
URL: http://svn.apache.org/viewvc?rev=590046&view=rev
Log:
DERBY-2065 Network and embedded difference in SQLSTATE and message when Connection.close() with open transaction
Patch DERBY-2065-2; remove unused error message "25000".
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties
db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SQLStateConstants.java
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml?rev=590046&r1=590045&r2=590046&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml Tue Oct 30 04:48:20 2007
@@ -740,11 +740,6 @@
<title>Class 25: Invalid Transaction State</title>
<msg>
- <name>25000</name>
- <text>Invalid transaction state.</text>
- </msg>
-
- <msg>
<name>25001</name>
<text>Cannot close a connection while a transaction is still active.</text>
</msg>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties?rev=590046&r1=590045&r2=590046&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties Tue Oct 30 04:48:20 2007
@@ -1147,7 +1147,6 @@
XCL52.S=P\u0159\u00edkaz byl zru\u0161en nebo vypr\u0161el jeho \u010dasov\u00fd limit.
# Transaction states, matches DB2
-25000=Neplatn\u00fd stav transakce.
25001=Nelze zav\u0159\u00edt spojen\u00ed, kdy\u017e je transakce st\u00e1le aktivn\u00ed.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties?rev=590046&r1=590045&r2=590046&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties Tue Oct 30 04:48:20 2007
@@ -1164,7 +1164,6 @@
XCL52.S=Die Anweisung wurde abgebrochen, oder das Zeitlimit f\u00fcr die Anweisung wurde \u00fcberschritten.
# Transaction states, matches DB2
-25000=Ung\u00fcltiger Transaktionsstatus
25001=Eine Verbindung kann nicht beendet werden, solange noch eine Transaktion aktiv ist.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties?rev=590046&r1=590045&r2=590046&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties Tue Oct 30 04:48:20 2007
@@ -1147,7 +1147,6 @@
XCL52.S=La sentencia se ha cancelado o ha excedido el tiempo de espera.
# Transaction states, matches DB2
-25000=Estado de transacci\u00f3n no v\u00e1lido.
25001=No se puede cerrar una conexi\u00f3n mientras todav\u00eda siga activa una transacci\u00f3n.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties?rev=590046&r1=590045&r2=590046&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties Tue Oct 30 04:48:20 2007
@@ -1147,7 +1147,6 @@
XCL52.S=Cette instruction a \u00e9t\u00e9 annul\u00e9e ou interrompue.
# Transaction states, matches DB2
-25000=Etat de transaction non valide.
25001=Impossible de fermer une connexion tandis qu''une transaction est toujours active.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties?rev=590046&r1=590045&r2=590046&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties Tue Oct 30 04:48:20 2007
@@ -1147,7 +1147,6 @@
XCL52.S=Az utas\u00edt\u00e1s visszavon\u00e1sra ker\u00fclt vagy t\u00fall\u00e9pte az id\u0151korl\u00e1tot.
# Transaction states, matches DB2
-25000=\u00c9rv\u00e9nytelen tranzakci\u00f3s \u00e1llapot.
25001=A kapcsolat nem z\u00e1rhat\u00f3 le, am\u00edg van akt\u00edv tranzakci\u00f3.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties?rev=590046&r1=590045&r2=590046&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties Tue Oct 30 04:48:20 2007
@@ -1147,7 +1147,6 @@
XCL52.S=L''istruzione \u00e8 stata cancellata o si \u00e8 verificato il timeout.
# Transaction states, matches DB2
-25000=Stato transazione non valido.
25001=Impossibile chiudere una connessione se una transazione \u00e8 ancora attiva.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties?rev=590046&r1=590045&r2=590046&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties Tue Oct 30 04:48:20 2007
@@ -1149,7 +1149,6 @@
XCL52.S=\u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8\u306f\u53d6\u308a\u6d88\u3055\u308c\u305f\u304b\u3001\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u306b\u306a\u308a\u307e\u3057\u305f\u3002
# Transaction states, matches DB2
-25000=\u7121\u52b9\u306a\u30c8\u30e9\u30f3\u30b6\u30af\u30b7\u30e7\u30f3\u72b6\u614b\u3067\u3059\u3002
25001=\u30c8\u30e9\u30f3\u30b6\u30af\u30b7\u30e7\u30f3\u304c\u307e\u3060\u30a2\u30af\u30c6\u30a3\u30d6\u306a\u3068\u304d\u306b\u63a5\u7d9a\u3092\u30af\u30ed\u30fc\u30ba\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties?rev=590046&r1=590045&r2=590046&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties Tue Oct 30 04:48:20 2007
@@ -1158,7 +1158,6 @@
XCL52.S=\uba85\ub839\ubb38\uc774 \ucde8\uc18c\ub418\uc5c8\uac70\ub098 \uc2dc\uac04\uc885\ub8cc\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
# Transaction states, matches DB2
-25000=\uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \ud2b8\ub79c\uc7ad\uc158 \uc0c1\ud0dc.
25001=\ud2b8\ub79c\uc7ad\uc158\uc774 \ud65c\uc131 \uc911\uc778 \uacbd\uc6b0 \uc5f0\uacb0\uc744 \ub2eb\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties?rev=590046&r1=590045&r2=590046&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties Tue Oct 30 04:48:20 2007
@@ -1147,7 +1147,6 @@
XCL52.S=Instrukcja zosta\u0142a anulowana lub up\u0142yn\u0105\u0142 limit czasu.
# Transaction states, matches DB2
-25000=Niepoprawny stan transakcji.
25001=Nie mo\u017cna zamkn\u0105\u0107 po\u0142\u0105czenia, gdy transakcja jest nadal aktywna.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties?rev=590046&r1=590045&r2=590046&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties Tue Oct 30 04:48:20 2007
@@ -1143,7 +1143,6 @@
XCL52.S=A instru\u00e7\u00e3o foi cancelada ou expirou.
# Transaction states, matches DB2
-25000=Estado da transa\u00e7\u00e3o inv\u00e1lido.
25001=N\u00e3o \u00e9 poss\u00edvel fechar a conex\u00e3o quando a transa\u00e7\u00e3o ainda est\u00e1 ativa.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties?rev=590046&r1=590045&r2=590046&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties Tue Oct 30 04:48:20 2007
@@ -1147,7 +1147,6 @@
XCL52.S=\u041e\u043f\u0435\u0440\u0430\u0442\u043e\u0440 \u043e\u0442\u043c\u0435\u043d\u0435\u043d, \u0438\u043b\u0438 \u0438\u0441\u0442\u0435\u043a \u0435\u0433\u043e \u0442\u0430\u0439\u043c-\u0430\u0443\u0442.
# Transaction states, matches DB2
-25000=\u041d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u043e\u0435 \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438.
25001=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0437\u0430\u043a\u0440\u044b\u0442\u044c \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435, \u043f\u043e\u043a\u0430 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u044f \u0430\u043a\u0442\u0438\u0432\u043d\u0430.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties?rev=590046&r1=590045&r2=590046&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties Tue Oct 30 04:48:20 2007
@@ -1205,7 +1205,6 @@
XCL52.S=\u8bed\u53e5\u5df2\u53d6\u6d88\u6216\u8d85\u65f6\u3002
# Transaction states, matches DB2
-25000=\u4e8b\u52a1\u72b6\u6001\u65e0\u6548\u3002
25001=\u5f53\u4e8b\u52a1\u4ecd\u5904\u4e8e\u6d3b\u52a8\u72b6\u6001\u65f6\uff0c\u65e0\u6cd5\u5173\u95ed\u8fde\u63a5\u3002
Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties?rev=590046&r1=590045&r2=590046&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties Tue Oct 30 04:48:20 2007
@@ -1165,7 +1165,6 @@
XCL52.S=\u9673\u8ff0\u5f0f\u5df2\u53d6\u6d88\u6216\u903e\u6642\u3002
# Transaction states, matches DB2
-25000=\u7121\u6548\u7684\u4ea4\u6613\u72c0\u614b\u3002
25001=\u7576\u6709\u4ea4\u6613\u4ecd\u5728\u4f5c\u7528\u4e2d\u6642\uff0c\u4e0d\u80fd\u95dc\u9589\u9023\u7dda\u3002
Modified: db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java?rev=590046&r1=590045&r2=590046&view=diff
==============================================================================
--- db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java (original)
+++ db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java Tue Oct 30 04:48:20 2007
@@ -723,7 +723,6 @@
String LANG_INVALID_XML_CONTEXT_ITEM = "2200V";
String LANG_XQUERY_SERIALIZATION_ERROR = "2200W";
- String LANG_INVALID_TRANSACTION_STATE = "25000";
String CANNOT_CLOSE_ACTIVE_CONNECTION = "25001";
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SQLStateConstants.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SQLStateConstants.java?rev=590046&r1=590045&r2=590046&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SQLStateConstants.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SQLStateConstants.java Tue Oct 30 04:48:20 2007
@@ -235,8 +235,6 @@
= "26000";
public static final String INVALID_TRANSFORM_GROUP_NAME_SPECIFICATION_NO_SUBCLASS
= "0S000";
- public static final String INVALID_TRANSACTION_STATE_NO_SUBCLASS
- = "25000";
public static final String INVALID_TRANSACTION_STATE_ACTIVE_SQL_TRANSACTION
= "25001";
public static final String INVALID_TRANSACTION_STATE_BRANCH_TRANSACTION_ALREADY_ACTIVE