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.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2020-08-21 19:57:22 +03:00
parent 688fb6301c c277bcd591
commit aa6cb7ed03
54 changed files with 261 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
# ==== Usage ====
#
# [--let $shutdown_timeout= 30]
# [--let $shutdown_timeout= 60]
# [--let $allow_rpl_inited= 1]
# --source include/restart_mysqld.inc

4
mysql-test/include/rpl_stop_server.inc
View File

@@ -47,8 +47,8 @@ if ($rpl_debug)
--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.$rpl_server_number.expect
# Send shutdown to the connected server and give
# it 60 seconds to die before zapping it
shutdown_server 60;
# it 60 seconds (of mysqltest's default) to die before zapping it
shutdown_server;
--source include/wait_until_disconnected.inc

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

@@ -36,7 +36,7 @@
# # Stop the server
# let $restart_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
# --exec echo "wait" > $restart_file
# --shutdown_server 10
# --shutdown_server
# --source include/wait_until_disconnected.inc
#
# --error 1

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

@@ -1,6 +1,6 @@
# ==== Usage ====
#
# [--let $shutdown_timeout= 30]
# [--let $shutdown_timeout= 60]
# [--let $allow_rpl_inited= 1]
# --source include/shutdown_mysqld.inc