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ä
2019-08-16 14:35:32 +03:00
parent 6073049a36 c221bcdce7
commit 67ddb6507d
119 changed files with 2738 additions and 1304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/include/wait_for_slave_param.inc
View File

@@ -69,7 +69,7 @@ if (!$_slave_param_comparison)
if ($rpl_debug)
{
--echo Waiting until '$slave_param' $_slave_param_comparison '$slave_param_value' [timeout='$_slave_timeout', \$slave_error_param='$slave_error_param']
--echo Waiting until '$slave_param' $_slave_param_comparison '$slave_param_value' [\$slave_error_param='$slave_error_param']
}
--let $_slave_check_configured= query_get_value("SHOW SLAVE STATUS", Slave_IO_Running, 1)