Fix for Bug#113336 (Bug#36080226), Inconsistent getUpdateCount() Behavior with allowMultiQueries.

fjssilva · fjssilva · commit 3b9c627bfe0e · 2025-11-21T20:30:56.000Z
Change-Id: I95db599dbbb1867c626cc42e0045710e2e16b3a5
diff --git a/CHANGES b/CHANGES
@@ -3,6 +3,8 @@
 
 Version 9.6.0
 
+  - Fix for Bug#113336 (Bug#36080226), Inconsistent getUpdateCount() Behavior with allowMultiQueries.
+
   - Fix for Bug#118234 (Bug#37975837), A potential bugs in Mysql Connector/J.
 
   - Fix for Bug#113413 (Bug#36107426), Connection.changeUser cannot be done after DriverManager.loginTimeout elapses.
diff --git a/src/build/java/instrumentation/TranslateExceptions.java b/src/build/java/instrumentation/TranslateExceptions.java
@@ -390,7 +390,6 @@ public static void main(String[] args) throws Exception {
         catchRuntimeException(clazz, clazz.getDeclaredMethod("getBatchedGeneratedKeys", new CtClass[] { ctStatement }), EXCEPTION_INTERCEPTOR_GETTER);
         catchRuntimeException(clazz, clazz.getDeclaredMethod("getGeneratedKeysInternal", new CtClass[] { CtClass.longType }), EXCEPTION_INTERCEPTOR_GETTER);
         catchRuntimeException(clazz, clazz.getDeclaredMethod("getLastInsertID", new CtClass[] {}), EXCEPTION_INTERCEPTOR_GETTER);
-        catchRuntimeException(clazz, clazz.getDeclaredMethod("getLongUpdateCount", new CtClass[] {}), EXCEPTION_INTERCEPTOR_GETTER);
         catchRuntimeException(clazz, clazz.getDeclaredMethod("getOpenResultSetCount", new CtClass[] {}), EXCEPTION_INTERCEPTOR_GETTER);
         catchRuntimeException(clazz, clazz.getDeclaredMethod("getResultSetInternal", new CtClass[] {}), EXCEPTION_INTERCEPTOR_GETTER);
         catchRuntimeException(clazz, clazz.getDeclaredMethod("processMultiCountsAndKeys", new CtClass[] { ctStatementImpl, CtClass.intType, ctLongArray }),
diff --git a/src/main/user-impl/java/com/mysql/cj/jdbc/StatementImpl.java b/src/main/user-impl/java/com/mysql/cj/jdbc/StatementImpl.java
@@ -478,6 +478,8 @@ protected void implicitlyCloseAllOpenResults() throws SQLException {
                 this.generatedKeysResults.doClose(CloseOption.IMPLICIT);
             }
             closeAllOpenResults();
+            this.results = null;
+            this.generatedKeysResults = null;
         }
     }
 
@@ -1060,7 +1062,6 @@ private long[] executeBatchUsingMultiQueries(long individualStatementTimeout) th
                 int escapeAdjust = 1;
 
                 batchStmt.setEscapeProcessing(this.doEscapeProcessing);
-
                 if (this.doEscapeProcessing) {
                     escapeAdjust = 2; // We assume packet _could_ grow by this amount, as we're not sure how big statement will end up after escape processing
                 }
@@ -1143,6 +1144,7 @@ protected int processMultiCountsAndKeys(StatementImpl batchedStatement, int upda
         connectionLock.lock();
         try {
             updateCounts[updateCountCounter++] = batchedStatement.getLargeUpdateCount();
+            this.updateCount = batchedStatement.getLargeUpdateCount();
 
             boolean doGenKeys = this.batchedGeneratedKeys != null;
 
@@ -1158,6 +1160,7 @@ protected int processMultiCountsAndKeys(StatementImpl batchedStatement, int upda
 
             while (batchedStatement.getMoreResults() || batchedStatement.getLargeUpdateCount() != -1) {
                 updateCounts[updateCountCounter++] = batchedStatement.getLargeUpdateCount();
+                this.updateCount = batchedStatement.getLargeUpdateCount();
 
                 if (doGenKeys) {
                     long generatedKey = batchedStatement.getLastInsertID();
@@ -1648,31 +1651,6 @@ public long getLastInsertID() {
         }
     }
 
-    /**
-     * getLongUpdateCount returns the current result as an update count, if the
-     * result is a ResultSet or there are no more results, -1 is returned. It
-     * should only be called once per result.
-     *
-     * <p>
-     * This method returns longs as MySQL server returns 64-bit values for update counts
-     * </p>
-     *
-     * @return the current update count.
-     */
-    public long getLongUpdateCount() {
-        Lock connectionLock = checkClosed().getConnectionLock();
-        connectionLock.lock();
-        try {
-            if (this.results == null || this.results.hasRows()) {
-                return -1;
-            }
-
-            return this.updateCount;
-        } finally {
-            connectionLock.unlock();
-        }
-    }
-
     @Override
     public int getMaxFieldSize() throws SQLException {
         Lock connectionLock = checkClosed().getConnectionLock();
@@ -2349,11 +2327,11 @@ public long getLargeUpdateCount() throws SQLException {
         Lock connectionLock = checkClosed().getConnectionLock();
         connectionLock.lock();
         try {
-            if (this.results == null || this.results.hasRows()) {
-                return -1;
+            if (this.results != null) {
+                return this.results.hasRows() ? -1 : this.results.getUpdateCount();
             }
 
-            return this.results.getUpdateCount();
+            return this.updateCount;
         } finally {
             connectionLock.unlock();
         }
diff --git a/src/test/java/testsuite/regression/StatementRegressionTest.java b/src/test/java/testsuite/regression/StatementRegressionTest.java
