[CONJ-269] handle server configuration autocommit=0

mariadb-corporation · Mar 24, 2016 · f566ca8 · f566ca8
1 parent 959dcd1
commit f566ca8
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractConnectProtocol.java b/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractConnectProtocol.java
@@ -374,10 +374,11 @@ public boolean isClosed() {
     }
 
     private void setSessionOptions()  throws QueryException {
-        // In JDBC, connection must start in autocommit mode.
-        if ((serverStatus & ServerStatus.AUTOCOMMIT) == 0) {
-            executeQuery("set autocommit=1", false);
-        }
+        // In JDBC, connection must start in autocommit mode
+        // [CONJ-269] we cannot rely on serverStatus & ServerStatus.AUTOCOMMIT before this command to avoid this command.
+        // if autocommit=0 is set on server configuration, DB always send Autocommit on serverStatus flag
+        // after setting autocommit, we can rely on serverStatus value
+        executeQuery("set session autocommit=1", false);
         if (urlParser.getOptions().sessionVariables != null) {
             executeQuery("set session " + urlParser.getOptions().sessionVariables, false);
         }