diff options
| -rw-r--r-- | mysql-test/suite/multi_source/multisource_for_channel.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/multi_source/multisource_for_channel.test | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/suite/multi_source/multisource_for_channel.result b/mysql-test/suite/multi_source/multisource_for_channel.result index f96a5a93b97..56409bbc6ce 100644 --- a/mysql-test/suite/multi_source/multisource_for_channel.result +++ b/mysql-test/suite/multi_source/multisource_for_channel.result @@ -282,7 +282,7 @@ include/wait_for_slave_to_start.inc show slave status for channel 'master1' Master_Port = 'MYPORT_1' -Relay_Log_File = 'mysqld-relay-bin-master1.000005' +Relay_Log_File = 'mysqld-relay-bin-master1.00000[45]' Slave_IO_Running = 'Yes' Slave_SQL_Running = 'Yes' Last_Errno = '0' diff --git a/mysql-test/suite/multi_source/multisource_for_channel.test b/mysql-test/suite/multi_source/multisource_for_channel.test index 9b74ea97742..19200e5b926 100644 --- a/mysql-test/suite/multi_source/multisource_for_channel.test +++ b/mysql-test/suite/multi_source/multisource_for_channel.test @@ -329,7 +329,9 @@ START SLAVE for channel 'master1'; --echo --echo show slave status for channel 'master1' --let $status_items= Master_Port, Relay_Log_File, Slave_IO_Running, Slave_SQL_Running, Last_Errno, Last_SQL_Errno ---let $slave_field_result_replace= /$SERVER_MYPORT_1/MYPORT_1/ /Preparing/Yes/ +# Relay log rotation from 4 to 5 is asynchronous with the show-slave-status, +# so both possible results are masked as [45]. +--let $slave_field_result_replace= /$SERVER_MYPORT_1/MYPORT_1/ /Preparing/Yes/ /000004/00000[45]/ /000005/00000[45]/ --let $slave_name= 'master1' --let $for_channel= 1 --source include/show_slave_status.inc |