Merge branch '2.3' into 2.4

system-test/change_master.cpp

@@ -0,0 +1,34 @@
+#include <iostream>
+#include <maxtest/testconnections.h>
+
+using namespace std;
+
+int main(int argc, char* argv[])
+{
+    int OldMaster;
+    int NewMaster;
+
+    if (argc != 3)
+    {
+        printf("Usage: change_master NewMasterNode OldMasterNode\n");
+        exit(1);
+    }
+    TestConnections* Test = new TestConnections(argc, argv);
+
+    sscanf(argv[1], "%d", &NewMaster);
+    sscanf(argv[2], "%d", &OldMaster);
+
+    Test->tprintf("Changing master from node %d (%s) to node %d (%s)\n",
+                  OldMaster,
+                  Test->repl->IP[OldMaster],
+                  NewMaster,
+                  Test->repl->IP[NewMaster]);
+
+    Test->repl->connect();
+    Test->repl->change_master(NewMaster, OldMaster);
+    Test->repl->close_connections();
+
+    int rval = Test->global_result;
+    delete Test;
+    return rval;
+}