Connector/J commit: r6517 - branches/branch_5_1/connector-j/src/com/mysql/jdbc

[mmatthews]

Modified:
   branches/branch_5_1/connector-j/src/com/mysql/jdbc/PreparedStatement.java
   branches/branch_5_1/connector-j/src/com/mysql/jdbc/StatementImpl.java
Log:
Merge of fix for Bug 30550.

Modified: branches/branch_5_1/connector-j/src/com/mysql/jdbc/PreparedStatement.java
===================================================================
--- branches/branch_5_1/connector-j/src/com/mysql/jdbc/PreparedStatement.java	2007-08-29 16:05:32 UTC (rev 6516)
+++ branches/branch_5_1/connector-j/src/com/mysql/jdbc/PreparedStatement.java	2007-08-29 16:14:04 UTC (rev 6517)
@@ -1043,6 +1043,10 @@
 		}
 
 		synchronized (this.connection.getMutex()) {
+			if (this.batchedArgs == null || this.batchedArgs.size() == 0) {
+                return new int[0];
+            }
+			
 			try {
 				clearWarnings();
 

Modified: branches/branch_5_1/connector-j/src/com/mysql/jdbc/StatementImpl.java
===================================================================
--- branches/branch_5_1/connector-j/src/com/mysql/jdbc/StatementImpl.java	2007-08-29 16:05:32 UTC (rev 6516)
+++ branches/branch_5_1/connector-j/src/com/mysql/jdbc/StatementImpl.java	2007-08-29 16:14:04 UTC (rev 6517)
@@ -894,6 +894,10 @@
 		}
 
 		synchronized (locallyScopedConn.getMutex()) {
+			if (this.batchedArgs == null || this.batchedArgs.size() == 0) {
+                return new int[0];
+            }
+			
 			try {
 				this.retrieveGeneratedKeys = true;