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-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/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