Skip to content

M
MariaDB
Commit 9226c847 authored by Luis Soares's avatar Luis Soares
Browse files
Options

BUG#44661: automerge local 5.1-bt bug branch --> local 5.1-bt up to date

parents 15127bcd a00bb757
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
mysql-test/extra/rpl_tests/rpl_failed_optimize.test
View file @ 9226c847
...@@ -22,3 +22,4 @@ connection master; ...@@ -22,3 +22,4 @@ connection master;
select * from t1; select * from t1;
commit; commit;
drop table t1; drop table t1;
-- sync_slave_with_master
mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result
View file @ 9226c847
...@@ -102,3 +102,4 @@ Last_IO_Errno # ...@@ -102,3 +102,4 @@ Last_IO_Errno #
Last_IO_Error # Last_IO_Error #
Last_SQL_Errno 0 Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
DROP TABLE t1;
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test
View file @ 9226c847
...@@ -58,3 +58,4 @@ STOP SLAVE; ...@@ -58,3 +58,4 @@ STOP SLAVE;
# cleanup # cleanup
--connection master --connection master
DROP TABLE t1; DROP TABLE t1;
-- sync_slave_with_master
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test
View file @ 9226c847
...@@ -78,3 +78,7 @@ SELECT * FROM t1 ORDER BY a; ...@@ -78,3 +78,7 @@ SELECT * FROM t1 ORDER BY a;
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # --replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 #
query_vertical SHOW SLAVE STATUS; query_vertical SHOW SLAVE STATUS;
-- connection master
DROP TABLE t1;
-- sync_slave_with_master
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7