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

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2020-08-21 20:32:04 +03:00
parent d98ccbe1e1 aa6cb7ed03
commit 0b4ed0b7fb
56 changed files with 261 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/multi_source/info_logs.test
View File

@ -150,7 +150,7 @@ show all slaves status;
--append_file $MYSQLTEST_VARDIR/tmp/mysqld.3.expect
restart
EOF
--shutdown_server 60
--shutdown_server
--source include/wait_until_connected_again.inc
--source include/wait_for_slave_to_start.inc
set default_master_connection = 'MASTER 2.2';