Merge branch '23.08' into 24.02

mariadb-joecotellese · Jun 25, 2024 · 557444f · 557444f
2 parents 5ad948d + 6d0d203
commit 557444f
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/system-test/maxtest/src/testconnections.cc b/system-test/maxtest/src/testconnections.cc
@@ -195,12 +195,6 @@ int TestConnections::prepare_for_test(int argc, char* argv[])
                 {
                     rc = BROKEN_VM_FAIL;
                 }
-                else
-                {
-                    // Make sure that the connections to the cluster are closed. Some tests expect that the
-                    // connect() call will open up a new connection.
-                    cluster->disconnect();
-                }
             }
         };
 
@@ -263,6 +257,20 @@ int TestConnections::prepare_for_test(int argc, char* argv[])
     {
         rc = 1;
     }
+    else
+    {
+        // Make sure that the connections to the cluster are closed. Some tests expect that the
+        // connect() call will open up a new connection.
+        if (repl)
+        {
+            repl->disconnect();
+        }
+
+        if (galera)
+        {
+            galera->disconnect();
+        }
+    }
 
     return rc;
 }