Commit 193a8f97 authored by He Zhenxing's avatar He Zhenxing

fix after merge

mysql-test/extra/rpl_tests/rpl_row_basic.test:
  remove extra sync_slave_with_master
parent ef58dcfc
...@@ -356,8 +356,6 @@ INSERT INTO t1 VALUES (1, "", 1); ...@@ -356,8 +356,6 @@ INSERT INTO t1 VALUES (1, "", 1);
INSERT INTO t1 VALUES (2, repeat(_utf8'a', 16), 2); INSERT INTO t1 VALUES (2, repeat(_utf8'a', 16), 2);
sync_slave_with_master; sync_slave_with_master;
sync_slave_with_master;
let $diff_table_1=master:test.t1; let $diff_table_1=master:test.t1;
let $diff_table_2=slave:test.t1; let $diff_table_2=slave:test.t1;
source include/diff_tables.inc; source include/diff_tables.inc;
...@@ -368,8 +366,6 @@ INSERT INTO t2 VALUES (1, "", 1); ...@@ -368,8 +366,6 @@ INSERT INTO t2 VALUES (1, "", 1);
INSERT INTO t2 VALUES (2, repeat(_utf8'a', 16), 2); INSERT INTO t2 VALUES (2, repeat(_utf8'a', 16), 2);
sync_slave_with_master; sync_slave_with_master;
sync_slave_with_master;
let $diff_table_1=master:test.t2; let $diff_table_1=master:test.t2;
let $diff_table_2=slave:test.t2; let $diff_table_2=slave:test.t2;
source include/diff_tables.inc; source include/diff_tables.inc;
...@@ -399,8 +395,6 @@ INSERT INTO t4 VALUES (1, "", 1); ...@@ -399,8 +395,6 @@ INSERT INTO t4 VALUES (1, "", 1);
INSERT INTO t4 VALUES (2, repeat(_utf8'a', 128), 2); INSERT INTO t4 VALUES (2, repeat(_utf8'a', 128), 2);
sync_slave_with_master; sync_slave_with_master;
sync_slave_with_master;
let $diff_table_1=master:test.t4; let $diff_table_1=master:test.t4;
let $diff_table_2=slave:test.t4; let $diff_table_2=slave:test.t4;
source include/diff_tables.inc; source include/diff_tables.inc;
...@@ -449,8 +443,6 @@ INSERT INTO t7 VALUES (1, "", 1); ...@@ -449,8 +443,6 @@ INSERT INTO t7 VALUES (1, "", 1);
INSERT INTO t7 VALUES (2, repeat(_utf8'a', 255), 2); INSERT INTO t7 VALUES (2, repeat(_utf8'a', 255), 2);
sync_slave_with_master; sync_slave_with_master;
sync_slave_with_master;
let $diff_table_1=master:test.t7; let $diff_table_1=master:test.t7;
let $diff_table_2=slave:test.t7; let $diff_table_2=slave:test.t7;
source include/diff_tables.inc; source include/diff_tables.inc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment