Connector/J commit: r6426 - in branches: branch_5_0/connector-j/src/testsuite/regression branch_5_1/connector-j/src/testsuite/regression

[mmatthews]

Modified:
   branches/branch_5_0/connector-j/src/testsuite/regression/ConnectionRegressionTest.java
   branches/branch_5_1/connector-j/src/testsuite/regression/ConnectionRegressionTest.java
Log:
Use testsuite statement instance for "KILL"s, makes testFailoverReadonly more robust, less influence by timing factors.

Modified: branches/branch_5_0/connector-j/src/testsuite/regression/ConnectionRegressionTest.java
===================================================================
--- branches/branch_5_0/connector-j/src/testsuite/regression/ConnectionRegressionTest.java	2007-05-11 23:23:05 UTC (rev 6425)
+++ branches/branch_5_0/connector-j/src/testsuite/regression/ConnectionRegressionTest.java	2007-05-14 19:08:11 UTC (rev 6426)
@@ -2088,8 +2088,9 @@
 			
 			String masterConnectionId = getSingleIndexedValueWithQuery(failoverConn, 1, "SELECT connection_id()").toString();
 			
-			failoverStmt.execute("KILL " + masterConnectionId);
 			
+			this.stmt.execute("KILL " + masterConnectionId);
+			
 			// die trying, so we get the next host
 			for (int i = 0; i < 100; i++) {
 				try {

Modified: branches/branch_5_1/connector-j/src/testsuite/regression/ConnectionRegressionTest.java
===================================================================
--- branches/branch_5_1/connector-j/src/testsuite/regression/ConnectionRegressionTest.java	2007-05-11 23:23:05 UTC (rev 6425)
+++ branches/branch_5_1/connector-j/src/testsuite/regression/ConnectionRegressionTest.java	2007-05-14 19:08:11 UTC (rev 6426)
@@ -2087,7 +2087,7 @@
 			
 			String masterConnectionId = getSingleIndexedValueWithQuery(failoverConn, 1, "SELECT connection_id()").toString();
 			
-			failoverStmt.execute("KILL " + masterConnectionId);
+			this.stmt.execute("KILL " + masterConnectionId);
 			
 			// die trying, so we get the next host
 			for (int i = 0; i < 100; i++) {