Index: src/interfaces/jdbc/org/postgresql/Connection.java
===================================================================
RCS file: /projects/cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/Connection.java,v
retrieving revision 1.42
diff -c -r1.42 Connection.java
*** src/interfaces/jdbc/org/postgresql/Connection.java	2002/03/05 18:00:36	1.42
--- src/interfaces/jdbc/org/postgresql/Connection.java	2002/03/08 17:38:28
***************
*** 139,144 ****
--- 139,146 ----
  	 */
  	protected void openConnection(String host, int port, Properties info, String database, String url, Driver d) throws SQLException
  	{
+ 		firstWarning = null;
+ 
  		// Throw an exception if the user or password properties are missing
  		// This occasionally occurs when the client uses the properties version
  		// of getConnection(), and is a common question on the email lists
***************
*** 209,215 ****
  						// The most common one to be thrown here is:
  						// "User authentication failed"
  						//
! 						throw new SQLException(pg_stream.ReceiveString(encoding));
  
  					case 'R':
  						// Get the type of request
--- 211,217 ----
  						// The most common one to be thrown here is:
  						// "User authentication failed"
  						//
! 						throw new PSQLException("postgresql.con.misc", pg_stream.ReceiveString(encoding));
  
  					case 'R':
  						// Get the type of request
***************
*** 304,311 ****
  				ckey = pg_stream.ReceiveIntegerR(4);
  				break;
  			case 'E':
  			case 'N':
! 				throw new SQLException(pg_stream.ReceiveString(encoding));
  			default:
  				throw new PSQLException("postgresql.con.setup");
  		}
--- 306,315 ----
  				ckey = pg_stream.ReceiveIntegerR(4);
  				break;
  			case 'E':
+ 				throw new PSQLException("postgresql.con.backend", pg_stream.ReceiveString(encoding));
  			case 'N':
! 				addWarning(pg_stream.ReceiveString(encoding));
! 				break;
  			default:
  				throw new PSQLException("postgresql.con.setup");
  		}
***************
*** 317,330 ****
  			case 'Z':
  				break;
  			case 'E':
! 			case 'N':
! 				throw new SQLException(pg_stream.ReceiveString(encoding));
  			default:
  				throw new PSQLException("postgresql.con.setup");
  		}
  
- 		firstWarning = null;
- 
  		// "pg_encoding_to_char(1)" will return 'EUC_JP' for a backend compiled with multibyte,
  		// otherwise it's hardcoded to 'SQL_ASCII'.
  		// If the backend doesn't know about multibyte we can't assume anything about the encoding
--- 321,331 ----
  			case 'Z':
  				break;
  			case 'E':
! 				throw new PSQLException("postgresql.con.backend", pg_stream.ReceiveString(encoding));
  			default:
  				throw new PSQLException("postgresql.con.setup");
  		}
  
  		// "pg_encoding_to_char(1)" will return 'EUC_JP' for a backend compiled with multibyte,
  		// otherwise it's hardcoded to 'SQL_ASCII'.
  		// If the backend doesn't know about multibyte we can't assume anything about the encoding
***************
*** 361,367 ****
  		initObjectTypes();
  
  		// Mark the connection as ok, and cleanup
- 		firstWarning = null;
  		PG_STATUS = CONNECTION_OK;
  	}
  
--- 362,367 ----
Index: src/interfaces/jdbc/org/postgresql/errors.properties
===================================================================
RCS file: /projects/cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/errors.properties,v
retrieving revision 1.7
diff -c -r1.7 errors.properties
*** src/interfaces/jdbc/org/postgresql/errors.properties	2001/09/06 03:03:37	1.7
--- src/interfaces/jdbc/org/postgresql/errors.properties	2002/03/08 17:38:28
***************
*** 3,8 ****
--- 3,9 ----
  postgresql.drv.version:An internal error has occured. Please recompile the driver.
  postgresql.con.auth:The authentication type {0} is not supported. Check that you have configured the pg_hba.conf file to include the client's IP address or Subnet, and that it is using an authentication scheme supported by the driver.
  postgresql.con.authfail:An error occured while getting the authentication request.
+ postgresql.con.backend:Backend start-up failed: {0}.
  postgresql.con.call:Callable Statements are not supported at this time.
  postgresql.con.creobj:Failed to create object for {0} {1}
  postgresql.con.failed:The connection attempt failed because {0}
***************
*** 11,19 ****
  postgresql.con.ioerror:An IO erro occured while sending to the backend - {0}
  postgresql.con.kerb4:Kerberos 4 authentication is not supported by this driver.
  postgresql.con.kerb5:Kerberos 5 authentication is not supported by this driver.
  postgresql.con.multres:Cannot handle multiple result groups.
  postgresql.con.pass:The password property is missing. It is mandatory.
! postgresql.con.refused:Connection refused. Check that the hostname and port is correct, and that the postmaster is running with the -i flag, which enables TCP/IP networking.
  postgresql.con.setup:Protocol error. Session setup failed.
  postgresql.con.strobj:The object could not be stored. Check that any tables required have already been created in the database.
  postgresql.con.strobjex:Failed to store object - {0}
--- 12,21 ----
  postgresql.con.ioerror:An IO erro occured while sending to the backend - {0}
  postgresql.con.kerb4:Kerberos 4 authentication is not supported by this driver.
  postgresql.con.kerb5:Kerberos 5 authentication is not supported by this driver.
+ postgresql.con.misc:A connection error has occurred: {0}
  postgresql.con.multres:Cannot handle multiple result groups.
  postgresql.con.pass:The password property is missing. It is mandatory.
! postgresql.con.refused:Connection refused. Check that the hostname and port
are correct and that the postmaster is accepting TCP/IP connections.
  postgresql.con.setup:Protocol error. Session setup failed.
  postgresql.con.strobj:The object could not be stored. Check that any tables required have already been created in the database.
  postgresql.con.strobjex:Failed to store object - {0}