bzr push into connector-j/branches/branch_5_1 branch (todd.farmer:760 to 762)

[Todd Farmer]

  762 Todd Farmer	2009-02-20
      Forcing ASCII encoding when converting seed String to byte array; using system default causes auth failures on EBCDIC platforms.
modified:
  CHANGES
  src/com/mysql/jdbc/Security.java

  761 Todd Farmer	2009-02-20
      Fixes BUG#43070 - Configuring traceProtocol in constructor so that handshake protocol is captured.
modified:
  CHANGES
  src/com/mysql/jdbc/MysqlIO.java

  760 mark@stripped	2009-02-02 [merge]
      Merged from upstream
modified:
  CHANGES
  build.xml
  src/com/mysql/jdbc/ConnectionImpl.java
  src/com/mysql/jdbc/LoadBalancingConnectionProxy.java
  src/com/mysql/jdbc/LocalizedErrorMessages.properties
  src/com/mysql/jdbc/PreparedStatement.java
  src/com/mysql/jdbc/StatementImpl.java
  src/testsuite/BaseTestCase.java
  src/testsuite/regression/StatementRegressionTest.java

=== modified file 'CHANGES'
--- a/CHANGES	2009-01-23 18:21:18 +0000
+++ b/CHANGES	2009-02-20 23:12:11 +0000
@@ -1,6 +1,13 @@
 # Changelog
 # $Id$
 nn-nn-08 - Version 5.1.8
+    - Fixed BUG#43071 - Specifying ASCII encoding for converting seed String to
+      byte array; allowing system default encoding to be used causes auth failures
+      on EBCDIC platforms.
+
+    - Fixed BUG#43070 - traceProtocol parameter isn't configured early enough to
+      capture handshake protocol.
+
     - Fixed BUG#41161 - PreparedStatement.addBatch() doesn't check for all parameters
       being set, which leads to a NullPointerException when calling executeBatch() and
       rewriting batched statements into multi-value or multi-statement statements.

=== modified file 'src/com/mysql/jdbc/MysqlIO.java'
--- a/src/com/mysql/jdbc/MysqlIO.java	2008-11-11 06:19:59 +0000
+++ b/src/com/mysql/jdbc/MysqlIO.java	2009-02-20 23:07:48 +0000
@@ -264,6 +264,8 @@ class MysqlIO {
         if (this.connection.getEnablePacketDebug()) {
             this.packetDebugRingBuffer = new LinkedList();
         }
+        this.traceProtocol = this.connection.getTraceProtocol();
+        
 
         this.useAutoSlowLog = this.connection.getAutoSlowLog();
         
@@ -1843,7 +1845,6 @@ class MysqlIO {
         // and we save 10-15% in overall performance by doing this...
         //
         this.enablePacketDebug = this.connection.getEnablePacketDebug();
-        this.traceProtocol = this.connection.getTraceProtocol();
         this.readPacketSequence = 0;
 
         int oldTimeout = 0;

=== modified file 'src/com/mysql/jdbc/Security.java'
--- a/src/com/mysql/jdbc/Security.java	2008-10-20 22:29:45 +0000
+++ b/src/com/mysql/jdbc/Security.java	2009-02-20 23:12:11 +0000
@@ -334,7 +334,7 @@ class Security {
 		byte[] passwordHashStage2 = md.digest(passwordHashStage1);
 		md.reset();
 
-		byte[] seedAsBytes = seed.getBytes(); // for debugging
+		byte[] seedAsBytes = seed.getBytes("ASCII"); // for debugging
 		md.update(seedAsBytes);
 		md.update(passwordHashStage2);