Fix for Bug#116318 (Bug#37152533), useServerPrepStmts useLocalTransac…

…tionState cause first execute rollback failure. Change-Id: Ifb5c03f5efda1a450a43d14a7a2bb4693dbad1b5
mysql · Dec 16, 2024 · a3909bf · a3909bf
1 parent c9e78a2
commit a3909bf
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 1 deletion.
diff --git a/CHANGES b/CHANGES
@@ -3,6 +3,8 @@
 
 Version 9.2.0
 
+  - Fix for Bug#116318 (Bug#37152533), useServerPrepStmts useLocalTransactionState cause first execute rollback failure.
+
   - Fix for Bug#116955 (Bug#37383012), Tests fail after server changed cipher for xdevapi.
 
   - Fix for Bug#63992 (Bug#14598872), getTables did not return a result for table names with a dot in it.

diff --git a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeProtocol.java b/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeProtocol.java
@@ -761,7 +761,7 @@ public NativePacketPayload checkErrorMessage() {
      */
     private NativePacketPayload checkErrorMessage(int command) {
         NativePacketPayload resultPacket = null;
-        this.serverSession.setStatusFlags(0);
+        this.serverSession.setStatusFlags(0, command == NativeConstants.COM_STMT_PREPARE);
 
         try {
             // Check return value, if we get a java.io.EOFException, the server has gone away. We'll pass it on up the exception chain and let someone higher up

diff --git a/src/test/java/testsuite/regression/ConnectionRegressionTest.java b/src/test/java/testsuite/regression/ConnectionRegressionTest.java
@@ -12271,4 +12271,59 @@ void testBug114705() throws Exception {
         }
     }
 
+    /**
+     * Tests fix for Bug#116318 (Bug#37152533), useServerPrepStmts useLocalTransactionState cause first execute rollback failure.
+     *
+     * @throws Exception
+     */
+    @Test
+    void testBug116318() throws Exception {
+        createTable("testBug116318", "(id INT PRIMARY KEY)");
+
+        boolean useSPS = false;
+        boolean useLTS = false;
+        boolean useLSS = false;
+
+        do {
+            final String testCase = String.format("Case: [useSPS: %s, useLTS: %s, useLSS: %s ]", useSPS ? "Y" : "N", useLTS ? "Y" : "N", useLSS ? "Y" : "N");
+
+            Properties props = new Properties();
+            props.setProperty(PropertyKey.sslMode.getKeyName(), PropertyDefinitions.SslMode.DISABLED.name());
+            props.setProperty(PropertyKey.allowPublicKeyRetrieval.getKeyName(), "true");
+            props.setProperty(PropertyKey.useServerPrepStmts.getKeyName(), Boolean.toString(useSPS));
+            props.setProperty(PropertyKey.useLocalTransactionState.getKeyName(), Boolean.toString(useLTS));
+            props.setProperty(PropertyKey.useLocalSessionState.getKeyName(), Boolean.toString(useLSS));
+
+            // Insert duplicate record one by one.
+            try (Connection testConn = getConnectionWithProps(props)) {
+                testConn.setAutoCommit(false);
+                PreparedStatement testPstmt = testConn.prepareStatement("INSERT INTO testBug116318 VALUES (1)");
+                testPstmt.executeUpdate();
+                PreparedStatement testPstmt2 = testConn.prepareStatement("INSERT INTO testBug116318 VALUES (1)");
+                assertThrows(testCase, SQLException.class, testPstmt2::executeUpdate);
+                testConn.rollback();
+                testConn.setAutoCommit(true); // Bad data must have been rolled back, otherwise this commits it.
+            }
+            this.rs = this.stmt.executeQuery("SELECT * FROM testBug116318");
+            assertFalse(this.rs.next(), testCase);
+
+            // Insert duplicate record in batch.
+            try (Connection testConn = getConnectionWithProps(props)) {
+                testConn.createStatement().execute("TRUNCATE TABLE testBug116318");
+                testConn.setAutoCommit(false);
+                PreparedStatement testPstmt = testConn.prepareStatement("INSERT INTO testBug116318 VALUES (1)");
+                testPstmt.addBatch();
+                testPstmt.executeBatch();
+                PreparedStatement testPstmt2 = testConn.prepareStatement("INSERT INTO testBug116318 VALUES (1)");
+                testPstmt2.addBatch();
+                assertThrows(testCase, SQLException.class, testPstmt2::executeBatch);
+                testConn.rollback();
+
+                testConn.setAutoCommit(true); // Bad data must have been rolled back, otherwise this commits it.
+            }
+            this.rs = this.stmt.executeQuery("SELECT * FROM testBug116318");
+            assertFalse(this.rs.next(), testCase);
+        } while ((useSPS = !useSPS) || (useLTS = !useLTS) || (useLSS = !useLSS));
+    }
+
 }