Connector/J commit: r6720 - in trunk: . src/com/mysql/jdbc

[mmatthews]

Modified:
   trunk/
   trunk/CHANGES
   trunk/src/com/mysql/jdbc/MysqlIOprotocol.java
Log:
Merged revisions
6585-6586,6593-6597,6599-6602,6605,6607-6609,6612,6614-6617,6619-6620,6623-6627,6632,6636-6638,6641,6649,6658-6659,6663,6665-6673,6676,6681-6682,6684,6686,6688,6690-6691,6693,6698,6707,6709-6713,6718-6719
via svnmerge from 
svn+ssh://mmatthews@stripped/connectors-svnroot/connector-j/branches/branch_5_1

.......
  r6719 | mmatthews | 2008-01-30 23:21:10 -0600 (Wed, 30 Jan 2008) | 3 lines
  
  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).
.......



Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /branches/branch_5_0:1-6636,6638-6670 /branches/branch_5_1:1-6582,6584-6678,6680-6717
   + /branches/branch_5_0:1-6636,6638-6670 /branches/branch_5_1:1-6582,6584-6678,6680-6719

Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES	2008-01-31 05:21:10 UTC (rev 6719)
+++ trunk/CHANGES	2008-01-31 05:28:50 UTC (rev 6720)
@@ -119,6 +119,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: trunk/src/com/mysql/jdbc/MysqlIOprotocol.java
===================================================================
--- trunk/src/com/mysql/jdbc/MysqlIOprotocol.java	2008-01-31 05:21:10 UTC (rev 6719)
+++ trunk/src/com/mysql/jdbc/MysqlIOprotocol.java	2008-01-31 05:28:50 UTC (rev 6720)
@@ -1079,7 +1079,7 @@
 
             errno = buf.readInt();
 
-            String serverErrorMessage = buf.readString();
+            String serverErrorMessage = buf.readString("ASCII");
 
             StringBuffer errorBuf = new StringBuffer(Messages.getString(
                         "MysqlIO.10")); //$NON-NLS-1$
@@ -1093,7 +1093,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$
@@ -1153,7 +1153,7 @@
         this.useNewUpdateCounts = versionMeetsMinimum(3, 22, 5);
 
         threadId = buf.readLong();
-        this.seed = buf.readString();
+        this.seed = buf.readString("ASCII");
 
         this.serverCapabilities = 0;
 
@@ -1169,7 +1169,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);
@@ -2582,7 +2582,7 @@
             }
 
             if (this.connection.isReadInfoMsgEnabled()) {
-                info = resultPacket.readString();
+                info =
resultPacket.readStringreadString(this.connection.getErrorMessageEncoding());
             }
         } catch (Exception ex) {
             SQLException sqlEx = SQLError.createSQLException(SQLError.get(