diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-20 11:13:40 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-20 11:13:40 +0300 |
| commit | e380f447421882d8a0700e8821e55e2786b426ad (patch) | |
| tree | 63a1657bc9c9add1233a1c3b7dd41e34110f0236 /mysql-test/suite/rpl/t | |
| parent | 1893a1370d744408a16548196a6dc62136157399 (diff) | |
| parent | 6b2c8cac1b52bee934ac88cc21c6023f48b69e57 (diff) | |
| download | mariadb-git-e380f447421882d8a0700e8821e55e2786b426ad.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/suite/rpl/t')
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_fail_register.test | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_fail_register.test b/mysql-test/suite/rpl/t/rpl_fail_register.test index d0502e734e2..d95a5c5f1c3 100644 --- a/mysql-test/suite/rpl/t/rpl_fail_register.test +++ b/mysql-test/suite/rpl/t/rpl_fail_register.test @@ -17,13 +17,12 @@ set global debug_dbug=@old_dbug; connection master; -### Dump thread is hanging despite slave has gracefully exited. let $id=`SELECT id from information_schema.processlist where command='Binlog Dump'`; if ($id) { replace_result $id DUMP_THREAD; eval kill $id; - let $wait_condition= SELECT count(*)=0 from information_schema.processlist where command='Binlog Dump'; + let $wait_condition= SELECT count(*)=0 from information_schema.processlist where command='Killed'; source include/wait_condition.inc; } |