[CONJ-729] master-slave regression: commit on read-only server

Executed only when there is an active transaction on master connection

src/main/java/org/mariadb/jdbc/internal/failover/impl/MastersSlavesListener.java

@@ -1016,8 +1016,8 @@ public boolean isMasterConnected() {
    * @return boolean
    */
   public boolean inTransaction() {
-    if (masterProtocol != null) {
-      return masterProtocol.inTransaction();
+    if (currentProtocol != null) {
+      return currentProtocol.inTransaction();
     }
     return true;
   }

src/test/java/org/mariadb/jdbc/failover/ReplicationFailoverTest.java

@@ -52,11 +52,13 @@
 
 package org.mariadb.jdbc.failover;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.sql.Connection;
+import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.concurrent.TimeUnit;
@@ -231,4 +233,32 @@ public void testFailNotOnSlave() throws Throwable {
     }
   }
 
+  @Test
+  public void commitExecutionOnSlave() throws SQLException {
+    try (Connection conn = getNewConnection()) {
+      Statement stmt = conn.createStatement();
+      stmt.execute("CREATE TABLE IF NOT EXISTS commitExecution(id int, val varchar(256))");
+      stmt.execute("TRUNCATE TABLE commitExecution");
+      stmt.execute("INSERT INTO commitExecution value (1, 'test')");
+      conn.setAutoCommit(false);
+      assertFalse(conn.getAutoCommit());
+      conn.setReadOnly(true);
+      assertFalse(conn.getAutoCommit());
+
+      ResultSet rs = conn.createStatement()
+          .executeQuery("SELECT COUNT(*) FROM commitExecution");
+      rs.next();
+      assertEquals(rs.getInt(1), 1);
+
+      conn.setReadOnly(false);
+      conn.createStatement().execute("INSERT INTO commitExecution value (2, 'test3')");
+      conn.commit();
+      conn.setReadOnly(true);
+      conn.commit();
+      rs = conn.createStatement().executeQuery("SELECT COUNT(*) FROM commitExecution");
+      rs.next();
+      assertEquals(rs.getInt(1), 2);
+    }
+  }
+
 }