mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Backport test cases fixes from 5.0
client/mysqldump.c: fflush stderr after printing of error message mysql-test/include/have_lowercase0.inc: Remove extra ; mysql-test/r/rpl000015.result: Update result mysql-test/r/rpl_change_master.result: Update result mysql-test/r/rpl_error_ignored_table.result: Update result mysql-test/r/rpl_loaddata.result: Update result mysql-test/r/rpl_log.result: Update result mysql-test/r/rpl_max_relay_size.result: Update result mysql-test/r/rpl_replicate_do.result: Update result mysql-test/t/lowercase_table3.test: Backport from 5.0 mysql-test/t/mysql_protocols.test: Backport from 5.0 mysql-test/t/rpl000015.test: Backport from 5.0 mysql-test/t/rpl_change_master.test: Backport from 5.0 mysql-test/t/rpl_drop_db.test: Backport from 5.0 mysql-test/t/rpl_error_ignored_table.test: Backport from 5.0 mysql-test/t/rpl_loaddata.test: Backport from 5.0 mysql-test/t/rpl_log-master.opt: Use --force-restart command in master.opt to force a restart for this test case mysql-test/t/rpl_log.test: Backport from 5.0 mysql-test/t/rpl_max_relay_size.test: Backport from 5.0 mysql-test/t/rpl_replicate_do.test: Backport from 5.0
This commit is contained in:
@ -72,7 +72,7 @@ set global sql_slave_skip_counter=1;
|
||||
start slave;
|
||||
sync_with_master;
|
||||
--replace_result $MASTER_MYPORT MASTER_PORT
|
||||
--replace_column 1 # 33 #
|
||||
--replace_column 1 # 8 # 9 # 23 # 33 #
|
||||
show slave status;
|
||||
|
||||
# Trigger error again to test CHANGE MASTER
|
||||
@ -92,7 +92,7 @@ stop slave;
|
||||
change master to master_user='test';
|
||||
change master to master_user='root';
|
||||
--replace_result $MASTER_MYPORT MASTER_PORT
|
||||
--replace_column 1 # 33 #
|
||||
--replace_column 1 # 8 # 9 # 23 # 33 #
|
||||
show slave status;
|
||||
|
||||
# Trigger error again to test RESET SLAVE
|
||||
@ -114,7 +114,7 @@ wait_for_slave_to_stop;
|
||||
stop slave;
|
||||
reset slave;
|
||||
--replace_result $MASTER_MYPORT MASTER_PORT
|
||||
--replace_column 1 # 33 #
|
||||
--replace_column 1 # 8 # 9 # 23 # 33 #
|
||||
show slave status;
|
||||
|
||||
# Finally, see if logging is done ok on master for a failing LOAD DATA INFILE
|
||||
|
Reference in New Issue
Block a user