database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2020-05-20 17:46:05 +03:00
parent db6e5bd9aa b8e694a314
commit 5ece2155cb
37 changed files with 466 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/rpl/t/rpl_fail_register.test
View File

@@ -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;
}