Connector/J commit: r6520 - in trunk: . connector-j/src/com/mysql/jdbc

[mmatthews]

Modified:
   trunk/
   trunk/connector-j/src/com/mysql/jdbc/PreparedStatement.java
   trunk/connector-j/src/com/mysql/jdbc/StatementImpl.java
Log:
Merged revisions 6515-6517 via svnmerge from 
svn+ssh://mmatthews@stripped/connectors-svnroot/connector-j/branches/branch_5_1

.......
  r6517 | mmatthews | 2007-08-29 11:14:04 -0500 (Wed, 29 Aug 2007) | 1 line
  
  Merge of fix for Bug 30550.
.......



Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /branches/branch_5_0:1-6511 /branches/branch_5_1:1-6514
   + /branches/branch_5_0:1-6511 /branches/branch_5_1:1-6517

Modified: trunk/connector-j/src/com/mysql/jdbc/PreparedStatement.java
===================================================================
--- trunk/connector-j/src/com/mysql/jdbc/PreparedStatement.java	2007-08-29 16:21:21 UTC (rev 6519)
+++ trunk/connector-j/src/com/mysql/jdbc/PreparedStatement.java	2007-08-29 16:27:40 UTC (rev 6520)
@@ -1043,6 +1043,10 @@
 		}
 
 		synchronized (this.connection.getMutex()) {
+			if (this.batchedArgs == null || this.batchedArgs.size() == 0) {
+                return new int[0];
+            }
+			
 			try {
 				clearWarnings();
 

Modified: trunk/connector-j/src/com/mysql/jdbc/StatementImpl.java
===================================================================
--- trunk/connector-j/src/com/mysql/jdbc/StatementImpl.java	2007-08-29 16:21:21 UTC (rev 6519)
+++ trunk/connector-j/src/com/mysql/jdbc/StatementImpl.java	2007-08-29 16:27:40 UTC (rev 6520)
@@ -894,6 +894,10 @@
 		}
 
 		synchronized (locallyScopedConn.getMutex()) {
+			if (this.batchedArgs == null || this.batchedArgs.size() == 0) {
+                return new int[0];
+            }
+			
 			try {
 				this.retrieveGeneratedKeys = true;