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 rh...@apache.org on 2007/03/05 20:58:02 UTC
svn commit: r514836 - in /db/derby/code/trunk/java:
engine/org/apache/derby/loc/ shared/org/apache/derby/shared/common/reference/
testing/org/apache/derbyTesting/functionTests/master/DerbyNet/
testing/org/apache/derbyTesting/functionTests/master/DerbyN...
Author: rhillegas
Date: Mon Mar 5 11:58:01 2007
New Revision: 514836
URL: http://svn.apache.org/viewvc?view=rev&rev=514836
Log:
DERBY-2264: Committed Dag's DERBY-2264-3 patch, eliminating error message garbling for clients.
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml
db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/users2.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users2.out
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?view=diff&rev=514836&r1=514835&r2=514836
==============================================================================
--- 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 Mon Mar 5 11:58:01 2007
@@ -845,7 +845,7 @@
</msg>
<msg>
- <name>2850H</name>
+ <name>2850H.C</name>
<text>User '{0}' cannot shut down database '{1}'. Only the database owner can perform this operation.</text>
<arg>authorizationID</arg>
<arg>databaseName</arg>
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?view=diff&rev=514836&r1=514835&r2=514836
==============================================================================
--- 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 Mon Mar 5 11:58:01 2007
@@ -1379,7 +1379,7 @@
String AUTH_NOT_DATABASE_OWNER = "2850E";
String AUTH_GRANT_REVOKE_NOT_ALLOWED = "2850F";
String AUTH_NO_OBJECT_PERMISSION = "2850G";
- String AUTH_NOT_DB_OWNER = "2850H";
+ String AUTH_NOT_DB_OWNER = "2850H.C";
/*
** Dependency manager
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/users2.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/users2.out?view=diff&rev=514836&r1=514835&r2=514836
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/users2.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/users2.out Mon Mar 5 11:58:01 2007
@@ -247,7 +247,7 @@
No connections available.
ij> -- Database shutdown - check user - should fail, not owner, cf DERBY-2264
connect 'wombat;user=francois;password=paceesalute;shutdown=true';
-ERROR 2850H: FRANCOISwombat2850H
+ERROR 2850H: User 'FRANCOIS' cannot shut down database 'wombat'. Only the database owner can perform this operation.
ij> -- Database shutdown - check owner - should succeed
connect 'wombat;user=system;password=manager;shutdown=true';
ERROR 08006: Database 'wombat' shutdown.
@@ -255,7 +255,7 @@
disconnect all;
ij> -- Database shutdown - check user - should fail, not owner, cf DERBY-2264
connect 'myDB;user=jerry;password=SacreBleu;shutdown=true';
-ERROR 2850H: JERRYmyDB2850H
+ERROR 2850H: User 'JERRY' cannot shut down database 'myDB'. Only the database owner can perform this operation.
ij> -- Database shutdown - check owner - should succeed
connect 'myDB;user=system;password=manager;shutdown=true';
ERROR 08006: Database 'myDB' shutdown.
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users2.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users2.out?view=diff&rev=514836&r1=514835&r2=514836
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users2.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users2.out Mon Mar 5 11:58:01 2007
@@ -247,7 +247,7 @@
No connections available.
ij> -- Database shutdown - check user - should fail, not owner, cf DERBY-2264
connect 'wombat;user=francois;password=paceesalute;shutdown=true';
-ERROR 2850H: DERBY SQL error: SQLCODE: -1, SQLSTATE: 2850H, SQLERRMC: FRANCOISwombat2850H
+ERROR 2850H: DERBY SQL error: SQLCODE: -1, SQLSTATE: 2850H, SQLERRMC: User 'FRANCOIS' cannot shut down database 'wombat'. Only the database owner can perform this operation.
ij> -- Database shutdown - check owner - should succeed
connect 'wombat;user=system;password=manager;shutdown=true';
ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat' shutdown.
@@ -255,7 +255,7 @@
disconnect all;
ij> -- Database shutdown - check user - should fail, not owner, cf DERBY-2264
connect 'myDB;user=jerry;password=SacreBleu;shutdown=true';
-ERROR 2850H: DERBY SQL error: SQLCODE: -1, SQLSTATE: 2850H, SQLERRMC: JERRYmyDB2850H
+ERROR 2850H: DERBY SQL error: SQLCODE: -1, SQLSTATE: 2850H, SQLERRMC: User 'JERRY' cannot shut down database 'myDB'. Only the database owner can perform this operation.
ij> -- Database shutdown - check owner - should succeed
connect 'myDB;user=system;password=manager;shutdown=true';
ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'myDB' shutdown.