db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r180107 - in /incubator/derby/code/trunk/java: drda/org/apache/derby/impl/drda/ testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/
Date Sun, 05 Jun 2005 16:14:35 GMT
Author: kmarsden
Date: Sun Jun  5 09:14:33 2005
New Revision: 180107

URL: http://svn.apache.org/viewcvs?rev=180107&view=rev
Log:

Fix for DERBY-285 Network Client should not print non-ascii token separators in message when
it cannot connect to the server to retrieve the error message 

This patch changes network server to send the complete message in its own locale instead of
just the message arguments and delimiters if the exception is severe enough to terminate the
connection. This will eliminate the special characters and provide a more readable message.

I also cleaned up the code a bit in this area. I removed the extra logging for the severe
exceptions as these will already be logged as part of the normal Derby error logging. 



Modified:
    incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/badConnection.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/dataSourcePermissions_net.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/secureUsers.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/secureUsers1.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/users.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/users2.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/badConnection.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dataSourcePermissions_net.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/netxaPositive.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/secureUsers.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/secureUsers1.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testij.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users2.out

Modified: incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java?rev=180107&r1=180106&r2=180107&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java (original)
+++ incubator/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java Sun
Jun  5 09:14:33 2005
@@ -5086,7 +5086,6 @@
 	{
 		String sqlerrmc;
 		String sqlState;
-		String severeExceptionInfo = null;
 		SQLException nextException = null;
 
 		if (rowCount < 0 && updateCount < 0)
@@ -5100,6 +5099,7 @@
 			sqlState = "     "; // set to 5 blanks when no error
 		}
 		else {
+			
 			if (sqlcode < 0)
 			{
 				if (SanityManager.DEBUG && server.debugOutput) 
@@ -5114,80 +5114,10 @@
 				}
 			}
 			sqlState = e.getSQLState();
-			if (e instanceof EmbedSQLException)
-			{
-				EmbedSQLException ce = (EmbedSQLException) e;
-				boolean severeException = (ce.getErrorCode() >=  ExceptionSeverity.SESSION_SEVERITY);
-				/* we need messageId to retrieve the localized message, just using
-				 * sqlstate may not be easy, because it is the messageId that we
-				 * used as key in the property file, for many sqlstates, they are
-				 * just the first 5 characters of the corresponding messageId.
-				 * We append messageId as the last element of sqlerrmc.  We can't
-				 * send messageId in the place of sqlstate because jcc expects only
-				 * 5 chars for sqlstate.
-				 */
-				sqlerrmc = "";
-				byte[] sep = {20};	// use it as separator of sqlerrmc tokens
-				byte[] errSep = {20, 20, 20};  // mark between exceptions
-				String separator = new String(sep);
-				String errSeparator = new String(errSep); 
-				String dbname = null;
-				if (database != null)
-					dbname = database.dbName;
-				
-				do {
-					String messageId = ce.getMessageId();
-					
-					// arguments are variable part of a message
-					Object[] args = ce.getArguments();
-					for (int i = 0; args != null &&  i < args.length; i++)
-						sqlerrmc += args[i] + separator;
-					
-					// Severe exceptions need to be logged in the error log
-					// also log location and non-localized message will be
-					// returned to client as appended arguments
-					if (severeException)	
-					{
-						if (severeExceptionInfo == null)
-							severeExceptionInfo = "";
-						severeExceptionInfo += ce.getMessage() + separator;
-						println2Log(dbname, session.drdaID, ce.getMessage());
-					}
-					sqlerrmc += messageId; 	//append MessageId
-				
-					e = ce.getNextException();
-					if (e != null) {
-						if (e instanceof EmbedSQLException) {
-							ce = (EmbedSQLException)e;
-							sqlerrmc += errSeparator + ce.getSQLState() + ":";
-						}
-						else {
-							sqlerrmc += errSeparator + e.getSQLState() + ":";
-							ce = null;
-						}
-					}
-					else
-						ce = null;
-				} while (ce != null);
-						
-				if (severeExceptionInfo != null)
-				{
-					severeExceptionInfo += "(" + "server log:" +
-                                           Monitor.getStream().getName() + ")" ;
-					sqlerrmc += separator + severeExceptionInfo;
-				}
-			}
-			else
-				sqlerrmc = e.getMessage();
+			sqlerrmc = buildSqlerrmc(e);
+			
 		}
-
-		// Truncate the sqlerrmc to a length that the client can support.
-		int maxlen = (sqlerrmc == null) ? -1 : Math.min(sqlerrmc.length(),
-				appRequester.supportedMessageParamLength());
-		if ((maxlen >= 0) && (sqlerrmc.length() > maxlen))
-		// have to truncate so the client can handle it.
-			sqlerrmc = sqlerrmc.substring(0, maxlen);
-
+		
 		//null indicator
 		writer.writeByte(0);
 
@@ -5203,6 +5133,119 @@
 		// SQLCAXGRP
 		writeSQLCAXGRP(updateCount, rowCount, sqlerrmc, nextException);
 	}
+	
+	
+	// Delimiters for SQLERRMC values.
+	
+	/**
+	 * <code>SQLERRMC_TOKEN_DELIMITER</code> separates message argument tokens 
+	 */
+	private static String SQLERRMC_TOKEN_DELIMITER = new String(new byte[] {20});
+	
+	/**
+	 * <code>SQLERRMC_MESSAGE_DELIMITER</code> When message argument tokes are sent,
+	 * this value separates the tokens for mulitiple error messages 
+	 */
+	private static String SQLERRMC_MESSAGE_DELIMITER = new String(new byte[] {20,20,20});
+	
+	/**
+	 * <code>SQLERRMC_PREFORMATTED_MESSAGE_DELIMITER</code>, When full message text
is 
+	 * sent for severe errors. This value separates the messages. 
+	 */
+	private static String SQLERRMC_PREFORMATTED_MESSAGE_DELIMITER = new String("::");
+	
+	/**
+	 * Create error message or message argements to return to client.  
+	 * The SQLERRMC will normally be passed back  to the server in a call 
+	 * to the SYSIBM.SQLCAMESSAGE but for severe exceptions the stored procedure 
+	 * call cannot be made. So for Severe messages we will just send the message text.
+	 * 
+	 * This method will also truncate the value according the client capacity.
+	 * CCC can only handle 70 characters.
+	 * 
+	 * @param se  SQLException to build SQLERRMC
+	 *  
+	 * @return  String which is either the message arguments to be passed to 
+	 *          SYSIBM.SQLCAMESSAGE or just message text for severe errors.  
+	 */
+	private String buildSqlerrmc (SQLException se) 
+	{
+		boolean severe = (se.getErrorCode() >=  ExceptionSeverity.SESSION_SEVERITY);	
+		String sqlerrmc = null;
+		if (se instanceof EmbedSQLException  && ! severe)
+			sqlerrmc = buildTokenizedSqlerrmc((EmbedSQLException) se);
+		else {
+			// If this is not an EmbedSQLException or is a severe excecption where
+			// we have no hope of succussfully calling the SYSIBM.SQLCAMESSAGE send
+			// preformatted message using the server locale
+			sqlerrmc = buildPreformattedSqlerrmc(se);
+			}
+			// Truncate the sqlerrmc to a length that the client can support.
+			int maxlen = (sqlerrmc == null) ? -1 : Math.min(sqlerrmc.length(),
+					appRequester.supportedMessageParamLength());
+			if ((maxlen >= 0) && (sqlerrmc.length() > maxlen))
+			// have to truncate so the client can handle it.
+			sqlerrmc = sqlerrmc.substring(0, maxlen);
+			return sqlerrmc;
+		}
+
+	
+	/**
+	 * Build preformatted SQLException text 
+	 * for severe exceptions or SQLExceptions that are not EmbedSQLExceptions.
+	 * Just send the message text localized to the server locale.
+	 * 
+	 * @param se  SQLException for which to build SQLERRMC
+	 * @return preformated message text 
+	 * 			with messages separted by SQLERRMC_PREFORMATED_MESSAGE_DELIMITER
+	 * 
+	 */
+	private String  buildPreformattedSqlerrmc(SQLException se) {
+		if (se == null)
+			return "";
+		
+		StringBuffer sb = new StringBuffer(); 
+		 // String buffer to build up message
+		do {
+			sb.append(se.getLocalizedMessage());
+			se = se.getNextException();
+			if (se != null)
+				sb.append(SQLERRMC_PREFORMATTED_MESSAGE_DELIMITER + 
+						"SQLSTATE: " + se.getSQLState());
+		} while (se != null);			
+		return sb.toString();		
+	}
+
+	/**
+	 * Build Tokenized SQLERRMC to just send the tokenized arguments to the client.
+	 * for a Derby SQLException
+	 * Message argument tokens are separated by SQLERRMC_TOKEN_DELIMITER 
+	 * Multiple messages are separated by SQLERRMC_MESSAGE_DELIMITER
+	 * 
+	 *                 ...
+	 * @param se   SQLException to print
+	 * 
+	 */
+	private String buildTokenizedSqlerrmc(EmbedSQLException se) {
+		
+		String sqlerrmc = "";
+		do {
+			String messageId = se.getMessageId();
+			// arguments are variable part of a message
+			Object[] args = se.getArguments();
+			for (int i = 0; args != null &&  i < args.length; i++)
+				sqlerrmc += args[i] + SQLERRMC_TOKEN_DELIMITER;
+			sqlerrmc += messageId;
+			se = (EmbedSQLException) se.getNextException();
+			if (se != null)
+			{
+				sqlerrmc += SQLERRMC_MESSAGE_DELIMITER + se.getSQLState() + ":";				
+			}
+		} while (se != null);
+		return sqlerrmc;
+	}
+
+	
 	/**
 	 * Write SQLCAXGRP
 	 *

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/badConnection.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/badConnection.out?rev=180107&r1=180106&r2=180107&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/badConnection.out
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/badConnection.out
Sun Jun  5 09:14:33 2005
@@ -15,4 +15,4 @@
 SQLState is: XJ05B
 vendorCode is: -1
 nextException is: null
-reason is: DB2 SQL error: SQLCODE: -1, SQLSTATE: XJ05B, SQLERRMC: upgradenotValidValue{true
|false}XJ05B.CJDBC attribute 'upgrade' has an invalid value 'notValidValue', valid values
are '{true |false}'.((server log XXX)
+reason is: DB2 SQL error: SQLCODE: -1, SQLSTATE: XJ05B, SQLERRMC: JDBC attribute 'upgrade'
has an invalid value 'notValidValue', valid values are '{true |false}'.

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/dataSourcePermissions_net.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/dataSourcePermissions_net.out?rev=180107&r1=180106&r2=180107&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/dataSourcePermissions_net.out
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/dataSourcePermissions_net.out
Sun Jun  5 09:14:33 2005
@@ -1,38 +1,38 @@
-EXPECTED SHUTDOWN DB2 SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: wombat08006.DDatabase
'wombat' shutdown.((server log XXX)
+EXPECTED SHUTDOWN DB2 SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat'
shutdown.
 Checking authentication with DriverManager
 EXPECTED CONNFAIL null userid not supported
 EXPECTED CONNFAIL Connection authorization failure occurred.  Reason: userid invalid.
 DS connected as EDWARD
 DS connected as FRANCES
 Checking connections with DataSource
-EXPECTED SHUTDOWN DB2 SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: wombat08006.DDatabase
'wombat' shutdown.((server log XXX)
+EXPECTED SHUTDOWN DB2 SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat'
shutdown.
 data source with no default user
 EXPECTED CONNFAIL null userid not supported
 EXPECTED CONNFAIL Connection authorization failure occurred.  Reason: userid invalid.
 DS connected as EDWARD
 DS connected as FRANCES
-EXPECTED SHUTDOWN DB2 SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: wombat08006.DDatabase
'wombat' shutdown.((server log XXX)
+EXPECTED SHUTDOWN DB2 SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat'
shutdown.
 data source with invalid default user
 EXPECTED CONNFAIL Connection authorization failure occurred.  Reason: userid invalid.
 DS connected as FRANCES
-EXPECTED SHUTDOWN DB2 SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: wombat08006.DDatabase
'wombat' shutdown.((server log XXX)
+EXPECTED SHUTDOWN DB2 SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat'
shutdown.
 data source with valid default user
 DS connected as EDWARD
 DS connected as FRANCES
-EXPECTED SHUTDOWN DB2 SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: wombat08006.DDatabase
'wombat' shutdown.((server log XXX)
+EXPECTED SHUTDOWN DB2 SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat'
shutdown.
 Checking connections with ConnectionPoolDataSource
 ConnectionPoolDataSource with no default user
 EXPECTED CONNFAIL null userid not supported
 EXPECTED CONNFAIL Connection authorization failure occurred.  Reason: userid invalid.
 CP connected as EDWARD
 CP connected as FRANCES
-EXPECTED SHUTDOWN DB2 SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: wombat08006.DDatabase
'wombat' shutdown.((server log XXX)
+EXPECTED SHUTDOWN DB2 SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat'
shutdown.
 ConnectionPoolDataSource with invalid default user
 EXPECTED CONNFAIL Connection authorization failure occurred.  Reason: userid invalid.
 CP connected as FRANCES
-EXPECTED SHUTDOWN DB2 SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: wombat08006.DDatabase
'wombat' shutdown.((server log XXX)
+EXPECTED SHUTDOWN DB2 SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat'
shutdown.
 ConnectionPoolDataSource with valid default user
 CP connected as EDWARD
 CP connected as FRANCES
-EXPECTED SHUTDOWN DB2 SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: wombat08006.DDatabase
'wombat' shutdown.((server log XXX)
+EXPECTED SHUTDOWN DB2 SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat'
shutdown.
 Completed dataSourcePermissions_net

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/secureUsers.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/secureUsers.out?rev=180107&r1=180106&r2=180107&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/secureUsers.out
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/secureUsers.out
Sun Jun  5 09:14:33 2005
@@ -77,13 +77,13 @@
 -----
 disconnect all;
 ij> connect 'wombat;user=system;password=manager;shutdown=true';
-ERROR 08006: wombat08006.DDatabase 'wombat' shutdown.((server log XXX)
+ERROR 08006: Database 'wombat' shutdown.
 ij> connect 'guestSchemeDB;user=system;password=manager;shutdown=true';
-ERROR 08006: guestSchemeDB08006.DDatabase 'guestSchemeDB' shutdown.((server log XXX)
+ERROR 08006: Database 'guestSchemeDB' shutdown.
 ij> connect 'derbySchemeDB;user=system;password=manager;shutdown=true';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij> connect 'simpleSchemeDB;user=system;password=manager;shutdown=true';
-ERROR 08006: simpleSchemeDB08006.DDatabase 'simpleSchemeDB' shutdown.((server log XXX)
+ERROR 08006: Database 'simpleSchemeDB' shutdown.
 ij> disconnect all;
 ij> -- shuting down the system causes IJ to loose the protocol, therefore
 ----- we'd be doomed :(
@@ -153,7 +153,7 @@
 ERROR 25503: DDL is not permitted for a read-only connection, user or database.
 ij(CONNECTION15)> -- Invalid ones:
 connect 'simpleSchemeDB;user=Jamie;password=theHooligan';
-ERROR 04501: 04501.CDatabase connection refused.((server log XXX)
+ERROR 04501: Database connection refused.
 ij(CONNECTION15)> connect 'simpleSchemeDB;user=dan;password=makeItFaster';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij(CONNECTION15)> connect 'simpleSchemeDB;user=francois;password=corsica';
@@ -186,13 +186,13 @@
 No connections available.
 ij> -- Database shutdown - check user - should succeed
 connect 'wombat;user=jeff;password=homeRun;shutdown=true';
-ERROR 08006: wombat08006.DDatabase 'wombat' shutdown.((server log XXX)
+ERROR 08006: Database 'wombat' shutdown.
 ij> connect 'guestSchemeDB;user=kreg;password=IwasBornReady;shutdown=true';
-ERROR 08006: guestSchemeDB08006.DDatabase 'guestSchemeDB' shutdown.((server log XXX)
+ERROR 08006: Database 'guestSchemeDB' shutdown.
 ij> connect 'derbySchemeDB;user=mamta;password=ieScape;shutdown=true';
-ERROR 08006: derbySchemeDB08006.DDatabase 'derbySchemeDB' shutdown.((server log XXX)
+ERROR 08006: Database 'derbySchemeDB' shutdown.
 ij> connect 'simpleSchemeDB;user=jeff;password=homeRun;shutdown=true';
-ERROR 08006: simpleSchemeDB08006.DDatabase 'simpleSchemeDB' shutdown.((server log XXX)
+ERROR 08006: Database 'simpleSchemeDB' shutdown.
 ij> show connections;
 No connections available.
 ij> -- Derby system shutdown - check user - should fail
@@ -201,5 +201,5 @@
 ij> disconnect all;
 ij> -- Derby system shutdown - check user - should succeed
 connect ';user=system;password=manager;shutdown=true';
-ERROR XJ015: XJ015.MDerby system shutdown.((server log XXX)
+ERROR XJ015: Derby system shutdown.
 ij> 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/secureUsers1.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/secureUsers1.out?rev=180107&r1=180106&r2=180107&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/secureUsers1.out
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/secureUsers1.out
Sun Jun  5 09:14:33 2005
@@ -28,7 +28,7 @@
 -----
 disconnect all;
 ij> connect 'ldapSchemeDB;user=system;password=manager;shutdown=true';
-ERROR 08006: ldapSchemeDB08006.DDatabase 'ldapSchemeDB' shutdown.((server log XXX)
+ERROR 08006: Database 'ldapSchemeDB' shutdown.
 ij> disconnect all;
 ij> connect 'ldapSchemeDB;user=mamta;password=yeeHaLdap';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
@@ -37,5 +37,5 @@
 ij> disconnect all;
 ij> -- Derby system shutdown - check user - should succeed
 connect ';user=system;password=manager;shutdown=true';
-ERROR XJ015: XJ015.MDerby system shutdown.((server log XXX)
+ERROR XJ015: Derby system shutdown.
 ij> 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/users.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/users.out?rev=180107&r1=180106&r2=180107&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/users.out
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/users.out
Sun Jun  5 09:14:33 2005
@@ -11,7 +11,7 @@
 ij(CONNECTION1)> autocommit on;
 ij(CONNECTION1)> disconnect;
 ij> connect 'wombat;shutdown=true;user=francois;password=paceesalute';
-ERROR 08006: wombat08006.DDatabase 'wombat' shutdown.((server log XXX)
+ERROR 08006: Database 'wombat' shutdown.
 ij> connect 'myDB;create=true;user=dan;password=MakeItFaster';
 ij(CONNECTION1)> autocommit off;
 ij(CONNECTION1)> prepare p2 as 'CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(?,?)';
@@ -24,7 +24,7 @@
 ij(CONNECTION1)> autocommit on;
 ij(CONNECTION1)> disconnect;
 ij> connect 'myDB;shutdown=true;user=dan;password=MakeItFaster';
-ERROR 08006: myDB08006.DDatabase 'myDB' shutdown.((server log XXX)
+ERROR 08006: Database 'myDB' shutdown.
 ij> -- beetle 5468
 disconnect all;
 ij> -- Specifically test JBMS users.
@@ -110,11 +110,11 @@
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij> -- Invalid database users
 connect 'myDB;user=howardR;password=IamBetterAtTennis';
-ERROR 04501: 04501.CDatabase connection refused.((server log XXX)
+ERROR 04501: Database connection refused.
 ij> connect 'wombat;user=jerry;password=SacreBleu';
-ERROR 04501: 04501.CDatabase connection refused.((server log XXX)
+ERROR 04501: Database connection refused.
 ij> connect 'wombat;user=jamie;password=MrNamePlates';
-ERROR 04501: 04501.CDatabase connection refused.((server log XXX)
+ERROR 04501: Database connection refused.
 ij> show connections;
 No connections available.
 ij> connect 'wombat;user=francois;password=paceesalute';
@@ -125,7 +125,7 @@
 ij(CONNECTION1)> connect 'myDB;user=jamie;password=LetMeIn;shutdown=true';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij(CONNECTION1)> connect 'wombat;user=jerry;password=SacreBleu;shutdown=true';
-ERROR 04501: 04501.CDatabase connection refused.((server log XXX)
+ERROR 04501: Database connection refused.
 ij(CONNECTION1)> show connections;
 CONNECTION0 - 	jdbc:derby:net://localhost:1527/wombat;user=francois;password=paceesalute
 CONNECTION1* - 	jdbc:derby:net://localhost:1527/myDB;user=jerry;password=SacreBleu
@@ -133,9 +133,9 @@
 ij(CONNECTION1)> -- Database shutdown - check user - should succeed
 ----- beetle 5367
 connect 'wombat;user=francois;password=paceesalute;shutdown=true';
-ERROR 08006: wombat08006.DDatabase 'wombat' shutdown.((server log XXX)
+ERROR 08006: Database 'wombat' shutdown.
 ij(CONNECTION1)> connect 'myDB;user=jerry;password=SacreBleu;shutdown=true';
-ERROR 08006: myDB08006.DDatabase 'myDB' shutdown.((server log XXX)
+ERROR 08006: Database 'myDB' shutdown.
 ij(CONNECTION1)> show connections;
 CONNECTION0 - 	jdbc:derby:net://localhost:1527/wombat;user=francois;password=paceesalute
 CONNECTION1* - 	jdbc:derby:net://localhost:1527/myDB;user=jerry;password=SacreBleu
@@ -146,7 +146,7 @@
 ij(CONNECTION1)> disconnect all;
 ij> -- JBMS System shutdown - check user - should succeed
 connect ';user=francois;password=paceesalute;shutdown=true';
-ERROR XJ015: XJ015.MDerby system shutdown.((server log XXX)
+ERROR XJ015: Derby system shutdown.
 ij> -- beetle 5390
 ----- the server does not shut down properly in network server
 ;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/users2.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/users2.out?rev=180107&r1=180106&r2=180107&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/users2.out
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/users2.out
Sun Jun  5 09:14:33 2005
@@ -18,7 +18,7 @@
 ij> autocommit on;
 ij> disconnect all;
 ij> connect 'wombat;shutdown=true;user=system;password=manager';
-ERROR 08006: wombat08006.DDatabase 'wombat' shutdown.((server log XXX)
+ERROR 08006: Database 'wombat' shutdown.
 ij> -- beetle 5468
 disconnect all;
 ij> connect 'wombat;user=system;password=manager';
@@ -91,7 +91,7 @@
 ij> autocommit on;
 ij> disconnect all;
 ij> connect 'myDB;shutdown=true;user=system;password=manager';
-ERROR 08006: myDB08006.DDatabase 'myDB' shutdown.((server log XXX)
+ERROR 08006: Database 'myDB' shutdown.
 ij> -- beetle 5468
 disconnect all;
 ij> connect 'myDB;user=system;password=manager';
@@ -222,11 +222,11 @@
 No connections available.
 ij> -- Database shutdown - check user - should succeed
 connect 'wombat;user=francois;password=paceesalute;shutdown=true';
-ERROR 08006: wombat08006.DDatabase 'wombat' shutdown.((server log XXX)
+ERROR 08006: Database 'wombat' shutdown.
 ij> -- beetle 5468
 disconnect all;
 ij> connect 'myDB;user=jerry;password=SacreBleu;shutdown=true';
-ERROR 08006: myDB08006.DDatabase 'myDB' shutdown.((server log XXX)
+ERROR 08006: Database 'myDB' shutdown.
 ij> -- beetle 5468
 disconnect all;
 ij> -- there should be no connections left here
@@ -237,5 +237,5 @@
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij> -- JBMS System shutdown - check user - should succeed
 connect ';user=system;password=manager;shutdown=true';
-ERROR XJ015: XJ015.MDerby system shutdown.((server log XXX)
+ERROR XJ015: Derby system shutdown.
 ij> 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/badConnection.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/badConnection.out?rev=180107&r1=180106&r2=180107&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/badConnection.out
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/badConnection.out
Sun Jun  5 09:14:33 2005
@@ -15,4 +15,4 @@
 SQLState is: XJ05B
 vendorCode is: -1
 nextException is: null
-reason is: DERBY SQL error: SQLCODE: -1, SQLSTATE: XJ05B, SQLERRMC: upgradenotValidValue{true
|false}XJ05B.CJDBC attribute 'upgrade' has an invalid value 'notValidValue', valid values
are '{true |false}'.((server log XXX)
+reason is: DERBY SQL error: SQLCODE: -1, SQLSTATE: XJ05B, SQLERRMC: JDBC attribute 'upgrade'
has an invalid value 'notValidValue', valid values are '{true |false}'.

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dataSourcePermissions_net.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dataSourcePermissions_net.out?rev=180107&r1=180106&r2=180107&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dataSourcePermissions_net.out
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dataSourcePermissions_net.out
Sun Jun  5 09:14:33 2005
@@ -1,40 +1,40 @@
-EXPECTED SHUTDOWN DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: wombat08006.DDatabase
'wombat' shutdown.((server log XXX)
+EXPECTED SHUTDOWN DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat'
shutdown.
 Checking authentication with DriverManager
 EXPECTED CONNFAIL Connection authorization failure occurred.  Reason: userid invalid.
 EXPECTED CONNFAIL Connection authorization failure occurred.  Reason: userid invalid.
 DS connected as EDWARD
 DS connected as FRANCES
 Checking connections with DataSource
-EXPECTED SHUTDOWN DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: wombat08006.DDatabase
'wombat' shutdown.((server log XXX)
+EXPECTED SHUTDOWN DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat'
shutdown.
 data source with no default user
 EXPECTED CONNFAIL null userid not supported
 EXPECTED CONNFAIL Connection authorization failure occurred.  Reason: userid invalid.
 DS connected as EDWARD
 DS connected as FRANCES
-EXPECTED SHUTDOWN DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: wombat08006.DDatabase
'wombat' shutdown.((server log XXX)
+EXPECTED SHUTDOWN DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat'
shutdown.
 data source with invalid default user
 EXPECTED CONNFAIL Connection authorization failure occurred.  Reason: userid invalid.
 DS connected as FRANCES
-EXPECTED SHUTDOWN DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: wombat08006.DDatabase
'wombat' shutdown.((server log XXX)
+EXPECTED SHUTDOWN DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat'
shutdown.
 data source with valid default user
 DS connected as EDWARD
 DS connected as FRANCES
-EXPECTED SHUTDOWN DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: wombat08006.DDatabase
'wombat' shutdown.((server log XXX)
+EXPECTED SHUTDOWN DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat'
shutdown.
 Checking connections with ConnectionPoolDataSource
 ConnectionPoolDataSource with no default user
 EXPECTED CONNFAIL null userid not supported
 EXPECTED CONNFAIL Connection authorization failure occurred.  Reason: userid invalid.
 CP connected as EDWARD
 CP connected as FRANCES
-EXPECTED SHUTDOWN DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: wombat08006.DDatabase
'wombat' shutdown.((server log XXX)
+EXPECTED SHUTDOWN DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat'
shutdown.
 ConnectionPoolDataSource with invalid default user
 EXPECTED CONNFAIL Connection authorization failure occurred.  Reason: userid invalid.
 CP connected as FRANCES
-EXPECTED SHUTDOWN DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: wombat08006.DDatabase
'wombat' shutdown.((server log XXX)
+EXPECTED SHUTDOWN DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat'
shutdown.
 ConnectionPoolDataSource with valid default user
 CP connected as EDWARD
 CP connected as FRANCES
-EXPECTED SHUTDOWN DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: wombat08006.DDatabase
'wombat' shutdown.((server log XXX)
+EXPECTED SHUTDOWN DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat'
shutdown.
 ** checkMessageText() with retrieveMessageText= false
 PASS: Message text not retrieved
 ** checkMessageText() with retrieveMessageText= true

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/netxaPositive.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/netxaPositive.out?rev=180107&r1=180106&r2=180107&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/netxaPositive.out
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/netxaPositive.out
Sun Jun  5 09:14:33 2005
@@ -38,7 +38,7 @@
 ij(XA)> xa_end xa_success 0;
 ij(XA)> xa_commit xa_1phase 0;
 ij(XA)> xa_datasource 'wombat' shutdown;
-ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: wombat08006.DDatabase
'wombat' shutdown.((server log XXX)
+ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat' shutdown.
 ij(XA)> ---------------------------------------------
 ----- two interleaving connections and prepare/commit prepare/rollback
 -----

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/secureUsers.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/secureUsers.out?rev=180107&r1=180106&r2=180107&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/secureUsers.out
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/secureUsers.out
Sun Jun  5 09:14:33 2005
@@ -77,13 +77,13 @@
 -----
 disconnect all;
 ij> connect 'wombat;user=system;password=manager;shutdown=true';
-ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: wombat08006.DDatabase
'wombat' shutdown.((server log XXX)
+ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat' shutdown.
 ij> connect 'guestSchemeDB;user=system;password=manager;shutdown=true';
-ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: guestSchemeDB08006.DDatabase
'guestSchemeDB' shutdown.((server log XXX)
+ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'guestSchemeDB'
shutdown.
 ij> connect 'derbySchemeDB;user=system;password=manager;shutdown=true';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij> connect 'simpleSchemeDB;user=system;password=manager;shutdown=true';
-ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: simpleSchemeDB08006.DDatabase
'simpleSchemeDB' shutdown.((server log XXX)
+ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'simpleSchemeDB'
shutdown.
 ij> disconnect all;
 ij> -- shuting down the system causes IJ to loose the protocol, therefore
 ----- we'd be doomed :(
@@ -153,7 +153,7 @@
 ERROR 25503: DDL is not permitted for a read-only connection, user or database.
 ij(CONNECTION15)> -- Invalid ones:
 connect 'simpleSchemeDB;user=Jamie;password=theHooligan';
-ERROR 04501: DERBY SQL error: SQLCODE: -1, SQLSTATE: 04501, SQLERRMC: 04501.CDatabase connection
refused.((server log XXX)
+ERROR 04501: DERBY SQL error: SQLCODE: -1, SQLSTATE: 04501, SQLERRMC: Database connection
refused.
 ij(CONNECTION15)> connect 'simpleSchemeDB;user=dan;password=makeItFaster';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij(CONNECTION15)> connect 'simpleSchemeDB;user=francois;password=corsica';
@@ -186,13 +186,13 @@
 No connections available.
 ij> -- Database shutdown - check user - should succeed
 connect 'wombat;user=jeff;password=homeRun;shutdown=true';
-ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: wombat08006.DDatabase
'wombat' shutdown.((server log XXX)
+ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat' shutdown.
 ij> connect 'guestSchemeDB;user=kreg;password=IwasBornReady;shutdown=true';
-ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: guestSchemeDB08006.DDatabase
'guestSchemeDB' shutdown.((server log XXX)
+ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'guestSchemeDB'
shutdown.
 ij> connect 'derbySchemeDB;user=mamta;password=ieScape;shutdown=true';
-ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: derbySchemeDB08006.DDatabase
'derbySchemeDB' shutdown.((server log XXX)
+ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'derbySchemeDB'
shutdown.
 ij> connect 'simpleSchemeDB;user=jeff;password=homeRun;shutdown=true';
-ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: simpleSchemeDB08006.DDatabase
'simpleSchemeDB' shutdown.((server log XXX)
+ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'simpleSchemeDB'
shutdown.
 ij> show connections;
 No connections available.
 ij> -- Derby system shutdown - check user - should fail
@@ -201,5 +201,5 @@
 ij> disconnect all;
 ij> -- Derby system shutdown - check user - should succeed
 connect ';user=system;password=manager;shutdown=true';
-ERROR XJ015: DERBY SQL error: SQLCODE: -1, SQLSTATE: XJ015, SQLERRMC: XJ015.MDerby system
shutdown.((server log XXX)
+ERROR XJ015: DERBY SQL error: SQLCODE: -1, SQLSTATE: XJ015, SQLERRMC: Derby system shutdown.
 ij> 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/secureUsers1.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/secureUsers1.out?rev=180107&r1=180106&r2=180107&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/secureUsers1.out
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/secureUsers1.out
Sun Jun  5 09:14:33 2005
@@ -28,7 +28,7 @@
 -----
 disconnect all;
 ij> connect 'ldapSchemeDB;user=system;password=manager;shutdown=true';
-ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: ldapSchemeDB08006.DDatabase
'ldapSchemeDB' shutdown.((server log XXX)
+ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'ldapSchemeDB'
shutdown.
 ij> disconnect all;
 ij> connect 'ldapSchemeDB;user=mamta;password=yeeHaLdap';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
@@ -37,5 +37,5 @@
 ij> disconnect all;
 ij> -- Derby system shutdown - check user - should succeed
 connect ';user=system;password=manager;shutdown=true';
-ERROR XJ015: DERBY SQL error: SQLCODE: -1, SQLSTATE: XJ015, SQLERRMC: XJ015.MDerby system
shutdown.((server log XXX)
+ERROR XJ015: DERBY SQL error: SQLCODE: -1, SQLSTATE: XJ015, SQLERRMC: Derby system shutdown.
 ij> 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testij.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testij.out?rev=180107&r1=180106&r2=180107&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testij.out
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testij.out
Sun Jun  5 09:14:33 2005
@@ -31,7 +31,7 @@
 ij(CONNECTION3)> connect  'jdbc:derby://localhost:1527/my-db-name;create=true;user=usr;password=pwd';
 ij(CONNECTION4)> connect 'jdbc:derby://localhost:1527/my-db-name;upgrade=true;user=usr;password=pwd';
 ij(CONNECTION5)> connect 'jdbc:derby://localhost:1527/my-db-name;shutdown=true;user=usr;password=pwd';
-ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: my-db-name08006.DDatabase
'my-db-name' shutdown.((server log XXX)
+ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'my-db-name'
shutdown.
 ij(CONNECTION5)> connect 'jdbc:derby://localhost:1527/./my-dbname;create=true;user=usr;password=pwd';
 ij(CONNECTION6)> connect 'jdbc:derby://localhost:1527/./my-dbname;create=true;user=usr;password=pwd';
 ij(CONNECTION7)> connect 'jdbc:derby://localhost:1527/toursDB' USER 'dbadmin' PASSWORD
'dbadbmin';
@@ -40,7 +40,7 @@
 ij(CONNECTION8)> connect  'jdbc:derby://localhost:1527/my-db-name;create=true;user=usr;password=pwd';
 ij(CONNECTION9)> connect 'jdbc:derby://localhost:1527/my-db-name;upgrade=true;user=usr;password=pwd';
 ij(CONNECTION10)> connect 'jdbc:derby://localhost:1527/my-db-name;shutdown=true;user=usr;password=pwd';
-ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: my-db-name08006.DDatabase
'my-db-name' shutdown.((server log XXX)
+ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'my-db-name'
shutdown.
 ij(CONNECTION10)> -- Database names with /'s
 connect 'jdbc:derby://localhost:1527/./my-dbname;create=true;user=usr;password=pwd';
 ij(CONNECTION11)> connect 'jdbc:derby://localhost:1527/./my-dbname;create=true;user=usr;password=pwd';

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users.out?rev=180107&r1=180106&r2=180107&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users.out
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users.out
Sun Jun  5 09:14:33 2005
@@ -11,7 +11,7 @@
 ij(CONNECTION1)> autocommit on;
 ij(CONNECTION1)> disconnect;
 ij> connect 'wombat;shutdown=true;user=francois;password=paceesalute';
-ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: wombat08006.DDatabase
'wombat' shutdown.((server log XXX)
+ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat' shutdown.
 ij> connect 'myDB;create=true;user=dan;password=MakeItFaster';
 ij(CONNECTION1)> autocommit off;
 ij(CONNECTION1)> prepare p2 as 'CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(?,?)';
@@ -24,7 +24,7 @@
 ij(CONNECTION1)> autocommit on;
 ij(CONNECTION1)> disconnect;
 ij> connect 'myDB;shutdown=true;user=dan;password=MakeItFaster';
-ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: myDB08006.DDatabase
'myDB' shutdown.((server log XXX)
+ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'myDB' shutdown.
 ij> -- beetle 5468
 disconnect all;
 ij> -- Specifically test JBMS users.
@@ -110,11 +110,11 @@
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij> -- Invalid database users
 connect 'myDB;user=howardR;password=IamBetterAtTennis';
-ERROR 04501: DERBY SQL error: SQLCODE: -1, SQLSTATE: 04501, SQLERRMC: 04501.CDatabase connection
refused.((server log XXX)
+ERROR 04501: DERBY SQL error: SQLCODE: -1, SQLSTATE: 04501, SQLERRMC: Database connection
refused.
 ij> connect 'wombat;user=jerry;password=SacreBleu';
-ERROR 04501: DERBY SQL error: SQLCODE: -1, SQLSTATE: 04501, SQLERRMC: 04501.CDatabase connection
refused.((server log XXX)
+ERROR 04501: DERBY SQL error: SQLCODE: -1, SQLSTATE: 04501, SQLERRMC: Database connection
refused.
 ij> connect 'wombat;user=jamie;password=MrNamePlates';
-ERROR 04501: DERBY SQL error: SQLCODE: -1, SQLSTATE: 04501, SQLERRMC: 04501.CDatabase connection
refused.((server log XXX)
+ERROR 04501: DERBY SQL error: SQLCODE: -1, SQLSTATE: 04501, SQLERRMC: Database connection
refused.
 ij> show connections;
 No connections available.
 ij> connect 'wombat;user=francois;password=paceesalute';
@@ -125,7 +125,7 @@
 ij(CONNECTION1)> connect 'myDB;user=jamie;password=LetMeIn;shutdown=true';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij(CONNECTION1)> connect 'wombat;user=jerry;password=SacreBleu;shutdown=true';
-ERROR 04501: DERBY SQL error: SQLCODE: -1, SQLSTATE: 04501, SQLERRMC: 04501.CDatabase connection
refused.((server log XXX)
+ERROR 04501: DERBY SQL error: SQLCODE: -1, SQLSTATE: 04501, SQLERRMC: Database connection
refused.
 ij(CONNECTION1)> show connections;
 CONNECTION0 - 	jdbc:derby://localhost:1527/wombat;user=francois;password=paceesalute
 CONNECTION1* - 	jdbc:derby://localhost:1527/myDB;user=jerry;password=SacreBleu
@@ -133,9 +133,9 @@
 ij(CONNECTION1)> -- Database shutdown - check user - should succeed
 ----- beetle 5367
 connect 'wombat;user=francois;password=paceesalute;shutdown=true';
-ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: wombat08006.DDatabase
'wombat' shutdown.((server log XXX)
+ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat' shutdown.
 ij(CONNECTION1)> connect 'myDB;user=jerry;password=SacreBleu;shutdown=true';
-ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: myDB08006.DDatabase
'myDB' shutdown.((server log XXX)
+ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'myDB' shutdown.
 ij(CONNECTION1)> show connections;
 CONNECTION0 - 	jdbc:derby://localhost:1527/wombat;user=francois;password=paceesalute
 CONNECTION1* - 	jdbc:derby://localhost:1527/myDB;user=jerry;password=SacreBleu
@@ -146,7 +146,7 @@
 ij(CONNECTION1)> disconnect all;
 ij> -- JBMS System shutdown - check user - should succeed
 connect ';user=francois;password=paceesalute;shutdown=true';
-ERROR XJ015: DERBY SQL error: SQLCODE: -1, SQLSTATE: XJ015, SQLERRMC: XJ015.MDerby system
shutdown.((server log XXX)
+ERROR XJ015: DERBY SQL error: SQLCODE: -1, SQLSTATE: XJ015, SQLERRMC: Derby system shutdown.
 ij> -- beetle 5390
 ----- the server does not shut down properly in network server
 ;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users2.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users2.out?rev=180107&r1=180106&r2=180107&view=diff
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users2.out
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users2.out
Sun Jun  5 09:14:33 2005
@@ -18,7 +18,7 @@
 ij> autocommit on;
 ij> disconnect all;
 ij> connect 'wombat;shutdown=true;user=system;password=manager';
-ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: wombat08006.DDatabase
'wombat' shutdown.((server log XXX)
+ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat' shutdown.
 ij> -- beetle 5468
 disconnect all;
 ij> connect 'wombat;user=system;password=manager';
@@ -91,7 +91,7 @@
 ij> autocommit on;
 ij> disconnect all;
 ij> connect 'myDB;shutdown=true;user=system;password=manager';
-ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: myDB08006.DDatabase
'myDB' shutdown.((server log XXX)
+ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'myDB' shutdown.
 ij> -- beetle 5468
 disconnect all;
 ij> connect 'myDB;user=system;password=manager';
@@ -222,11 +222,11 @@
 No connections available.
 ij> -- Database shutdown - check user - should succeed
 connect 'wombat;user=francois;password=paceesalute;shutdown=true';
-ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: wombat08006.DDatabase
'wombat' shutdown.((server log XXX)
+ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'wombat' shutdown.
 ij> -- beetle 5468
 disconnect all;
 ij> connect 'myDB;user=jerry;password=SacreBleu;shutdown=true';
-ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: myDB08006.DDatabase
'myDB' shutdown.((server log XXX)
+ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: Database 'myDB' shutdown.
 ij> -- beetle 5468
 disconnect all;
 ij> -- there should be no connections left here
@@ -237,5 +237,5 @@
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij> -- JBMS System shutdown - check user - should succeed
 connect ';user=system;password=manager;shutdown=true';
-ERROR XJ015: DERBY SQL error: SQLCODE: -1, SQLSTATE: XJ015, SQLERRMC: XJ015.MDerby system
shutdown.((server log XXX)
+ERROR XJ015: DERBY SQL error: SQLCODE: -1, SQLSTATE: XJ015, SQLERRMC: Derby system shutdown.
 ij> 



Mime
View raw message