Connector/J commit: r6719 - in branches/branch_5_1: . src/com/mysql/jdbc

[mmatthews]

Modified:
   branches/branch_5_1/CHANGES
   branches/branch_5_1/src/com/mysql/jdbc/MysqlIO.java
Log:
Fixed BUG#31192 - Encoding Issue retrieving serverVersion in MysqlIO in the 
      method doHandshake when encoding doesn't contain ASCII characters in the "standard"
      place (i.e. ebcdic).

Modified: branches/branch_5_1/CHANGES
===================================================================
--- branches/branch_5_1/CHANGES	2008-01-31 05:10:51 UTC (rev 6718)
+++ branches/branch_5_1/CHANGES	2008-01-31 05:21:10 UTC (rev 6719)
@@ -107,6 +107,10 @@
       getGeneratedKeys() when "rewriteBatchedStatements" is set to "true", and the 
       statement has an "ON DUPLICATE KEY UPDATE" clause.
 
+    - Fixed BUG#31192 - Encoding Issue retrieving serverVersion in MysqlIO in the 
+      method doHandshake when encoding doesn't contain ASCII characters in the "standard"
+      place (i.e. ebcdic).
+       
 10-09-07 - Version 5.1.5
 
     - Released instead of 5.1.4 to pickup patch for BUG#31053

Modified: branches/branch_5_1/src/com/mysql/jdbc/MysqlIO.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/MysqlIO.java	2008-01-31 05:10:51 UTC (rev 6718)
+++ branches/branch_5_1/src/com/mysql/jdbc/MysqlIO.java	2008-01-31 05:21:10 UTC (rev 6719)
@@ -1072,7 +1072,7 @@
 
             errno = buf.readInt();
 
-            String serverErrorMessage = buf.readString();
+            String serverErrorMessage = buf.readString("ASCII");
 
             StringBuffer errorBuf = new StringBuffer(Messages.getString(
                         "MysqlIO.10")); //$NON-NLS-1$
@@ -1086,7 +1086,7 @@
                  +errorBuf.toString(), xOpen, errno);
         }
 
-        this.serverVersion = buf.readString();
+        this.serverVersion = buf.readString("ASCII");
 
         // Parse the server version into major/minor/subminor
         int point = this.serverVersion.indexOf('.'); //$NON-NLS-1$
@@ -1146,7 +1146,7 @@
         this.useNewUpdateCounts = versionMeetsMinimum(3, 22, 5);
 
         threadId = buf.readLong();
-        this.seed = buf.readString();
+        this.seed = buf.readString("ASCII");
 
         this.serverCapabilities = 0;
 
@@ -1162,7 +1162,7 @@
             this.serverStatus = buf.readInt();
             buf.setPosition(position + 16);
 
-            String seedPart2 = buf.readString();
+            String seedPart2 = buf.readString("ASCII");
             StringBuffer newSeed = new StringBuffer(20);
             newSeed.append(this.seed);
             newSeed.append(seedPart2);
@@ -2575,7 +2575,7 @@
             }
 
             if (this.connection.isReadInfoMsgEnabled()) {
-                info = resultPacket.readString();
+                info =
resultPacket.readString(this.connection.getErrorMessageEncoding());
             }
         } catch (Exception ex) {
             SQLException sqlEx = SQLError.createSQLException(SQLError.get(