mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
f5ef5cb0af
Fixing tests and results to work when replicating to fewer columns on slave than on master. One test that previously should fail, now works, and some log positions have changed as a result of adding metadata to the events. mysql-test/extra/rpl_tests/rpl_row_tabledefs.test: Replication to fewer columns on slave now works. mysql-test/include/wait_for_slave_to_stop.inc: Adding subsitutions for SHOW SLAVE STATUS mysql-test/suite/binlog/r/binlog_row_binlog.result: Result change. mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result: Result change. mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result: Result change. mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result: Result change. mysql-test/suite/rpl/r/rpl_slave_skip.result: Result change. mysql-test/suite/rpl/t/rpl_skip_error-slave.opt: Error number changed [!]
39 lines
1 KiB
PHP
39 lines
1 KiB
PHP
###################################################
|
|
#Author: Jeb
|
|
#Date: 2007-06-11
|
|
#Purpose: To replace the mysqltest.c executable
|
|
# wait_for_slave_to_stop function and
|
|
# return this to the test language.
|
|
#Details:
|
|
# 1) Fill in and setup variables
|
|
# 2) loop through looking for both
|
|
# io and sql threads to stop
|
|
# 3) If loops too long die.
|
|
####################################################
|
|
connection slave;
|
|
let $row_number= 1;
|
|
let $run= 1;
|
|
let $counter= 300;
|
|
|
|
while ($run)
|
|
{
|
|
let $io_result= query_get_value("SHOW SLAVE STATUS", Slave_IO_Running, $row_number);
|
|
if (`SELECT '$io_result' = 'No'`){
|
|
|
|
let $sql_result= query_get_value("SHOW SLAVE STATUS", Slave_SQL_Running, $row_number);
|
|
if (`SELECT '$sql_result' = 'No'`){
|
|
let $run= 0;
|
|
}
|
|
}
|
|
sleep 0.1;
|
|
if (!$counter){
|
|
--echo "Failed while waiting for slave to stop"
|
|
--replace_result $MASTER_MYPORT MASTER_PORT
|
|
--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #
|
|
query_vertical SHOW SLAVE STATUS;
|
|
exit;
|
|
}
|
|
dec $counter;
|
|
}
|
|
|
|
|