bzr push into connector-j/branches/branch_5_1 branch (mark.matthews:1058 to 1059)

[mark.matthews]

 1059 mark.matthews@stripped	2011-04-15
      Fixing compilation error.

    modified:
      src/testsuite/regression/jdbc4/ConnectionRegressionTest.java
 1058 Administrator	2011-04-15
      Partial fix for BUG#54135 - setQueryTimeout unsafe across VIP. Fix prevents c/J from killing the right ConnectionID but on wrong server.

    modified:
      CHANGES
      src/com/mysql/jdbc/StatementImpl.java
=== modified file 'src/testsuite/regression/jdbc4/ConnectionRegressionTest.java'
--- a/src/testsuite/regression/jdbc4/ConnectionRegressionTest.java	2011-04-15 15:16:01 +0000
+++ b/src/testsuite/regression/jdbc4/ConnectionRegressionTest.java	2011-04-15 15:50:40 +0000
@@ -11,7 +11,6 @@ import com.mysql.jdbc.NonRegisteringDriv
 import com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource;
 
 import testsuite.BaseTestCase;
-import testsuite.regression.ConnectionRegressionTest;
 
 /**
  * @author Tonci


Attachment: [text/bzr-bundle] bzr/[e-mail]