From: Date: April 3 2006 7:44pm
Subject: Connector/J commit: r5123 - in branches: branch_3_1/connector-j/src/com/mysql/jdbc branch_5_0/connector-j/src/com/mysql/jdbc branch_5_1/connector-j/src/com/mysql/jdbc
List-Archive: http://lists.mysql.com/commits/4420
Message-Id: <200604031744.k33Hiqr8014930@bk-internal.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Modified:
   branches/branch_3_1/connector-j/src/com/mysql/jdbc/Statement.java
   branches/branch_5_0/connector-j/src/com/mysql/jdbc/Statement.java
   branches/branch_5_1/connector-j/src/com/mysql/jdbc/Statement.java
Log:
Only use multistatement batch execution on MySQL-4.1.1 or newer.

Modified: branches/branch_3_1/connector-j/src/com/mysql/jdbc/Statement.java
===================================================================
--- branches/branch_3_1/connector-j/src/com/mysql/jdbc/Statement.java	2006-04-03 15:37:11 UTC (rev 5122)
+++ branches/branch_3_1/connector-j/src/com/mysql/jdbc/Statement.java	2006-04-03 17:44:51 UTC (rev 5123)
@@ -688,9 +688,10 @@
 					
 					boolean multiQueriesEnabled = this.connection.getAllowMultiQueries();
 					
-					if (multiQueriesEnabled || 
+					if (this.connection.versionMeetsMinimum(4, 1, 1) && 
+							(multiQueriesEnabled || 
 							(this.connection.getRewriteBatchedStatements() && 
-									nbrCommands > 4)) {
+									nbrCommands > 4))) {
 						return executeBatchUsingMultiQueries(multiQueriesEnabled, nbrCommands);
 					}
 					

Modified: branches/branch_5_0/connector-j/src/com/mysql/jdbc/Statement.java
===================================================================
--- branches/branch_5_0/connector-j/src/com/mysql/jdbc/Statement.java	2006-04-03 15:37:11 UTC (rev 5122)
+++ branches/branch_5_0/connector-j/src/com/mysql/jdbc/Statement.java	2006-04-03 17:44:51 UTC (rev 5123)
@@ -855,9 +855,10 @@
 					
 					boolean multiQueriesEnabled = this.connection.getAllowMultiQueries();
 					
-					if (multiQueriesEnabled || 
+					if (this.connection.versionMeetsMinimum(4, 1, 1) && 
+							(multiQueriesEnabled || 
 							(this.connection.getRewriteBatchedStatements() && 
-									nbrCommands > 4)) {
+									nbrCommands > 4))) {
 						return executeBatchUsingMultiQueries(multiQueriesEnabled, nbrCommands);
 					}
 					

Modified: branches/branch_5_1/connector-j/src/com/mysql/jdbc/Statement.java
===================================================================
--- branches/branch_5_1/connector-j/src/com/mysql/jdbc/Statement.java	2006-04-03 15:37:11 UTC (rev 5122)
+++ branches/branch_5_1/connector-j/src/com/mysql/jdbc/Statement.java	2006-04-03 17:44:51 UTC (rev 5123)
@@ -855,9 +855,10 @@
 					
 					boolean multiQueriesEnabled = this.connection.getAllowMultiQueries();
 					
-					if (multiQueriesEnabled || 
+					if (this.connection.versionMeetsMinimum(4, 1, 1) && 
+							(multiQueriesEnabled || 
 							(this.connection.getRewriteBatchedStatements() && 
-									nbrCommands > 4)) {
+									nbrCommands > 4))) {
 						return executeBatchUsingMultiQueries(multiQueriesEnabled, nbrCommands);
 					}