summaryrefslogtreecommitdiff
path: root/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result')
-rw-r--r--mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result17
1 files changed, 6 insertions, 11 deletions
diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result
index dfbd7a37d8e..7ff7830449f 100644
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result
@@ -1,12 +1,6 @@
-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
-RESET MASTER;
-CHANGE MASTER TO master_host="127.0.0.1",master_port=SLAVE_PORT,master_user="root";
-START SLAVE;
+include/rpl_init.inc [topology=1->2->1]
+include/rpl_connect.inc [creating master]
+include/rpl_connect.inc [creating slave]
CREATE TABLE t1 (a int key, b int) ENGINE=ndb;
SHOW TABLES;
Tables_in_test
@@ -17,11 +11,12 @@ SELECT * FROM t1 ORDER BY a;
a b
1 2
2 3
-Checking that both slave threads are running.
+include/check_slave_is_running.inc
SELECT * FROM t1 ORDER BY a;
a b
1 2
2 3
-Checking that both slave threads are running.
+include/check_slave_is_running.inc
STOP SLAVE;
DROP TABLE t1;
+include/rpl_end.inc