diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-09-14 08:51:50 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-09-14 09:02:21 +0200 |
| commit | ba4a2a9775e3c41f7cd8b256cf378ff2864d98a1 (patch) | |
| tree | 1f6c26c5a87988c38e83117db0c77459e5bfe3b6 | |
| parent | 43953c970c7076255c7575e95d89ea7a8f3985c3 (diff) | |
| download | mariadb-git-preview-10.7-MDEV-26307-channel-syntax.tar.gz | |
fix a race condition in multi_source.multisource_for_channel testpreview-10.7-MDEV-26307-channel-syntax
| -rw-r--r-- | mysql-test/suite/multi_source/multisource_for_channel.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/include/multisource_for_channel.inc | 9 |
2 files changed, 1 insertions, 11 deletions
diff --git a/mysql-test/suite/multi_source/multisource_for_channel.result b/mysql-test/suite/multi_source/multisource_for_channel.result index 2cd00f0e36c..f96a5a93b97 100644 --- a/mysql-test/suite/multi_source/multisource_for_channel.result +++ b/mysql-test/suite/multi_source/multisource_for_channel.result @@ -292,9 +292,6 @@ Last_SQL_Errno = '0' # flush relay logs # FLUSH RELAY LOGS for channel 'master1'; -create table t1 (a int); -drop table t1; -connection slave; show slave status for channel 'master1' Master_Port = 'MYPORT_1' diff --git a/mysql-test/suite/rpl/include/multisource_for_channel.inc b/mysql-test/suite/rpl/include/multisource_for_channel.inc index b349ee31c94..a3e8f95fe38 100644 --- a/mysql-test/suite/rpl/include/multisource_for_channel.inc +++ b/mysql-test/suite/rpl/include/multisource_for_channel.inc @@ -355,15 +355,8 @@ START SLAVE for channel 'master1'; --echo # flush relay logs --echo # FLUSH RELAY LOGS for channel 'master1'; -let @wait_condition=SELECT Relay_log_file - -# Ensure we are using new relay log -connection master1; -create table t1 (a int); -drop table t1; -connection slave; ---sync_with_master 0,'master1' +--source include/wait_for_sql_thread_read_all.inc --echo --echo show slave status for channel 'master1' |