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/search_pattern_in_file.inc
View File

@@ -39,7 +39,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