database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch 10.2 into 10.3

Browse Source
This commit is contained in:
Julius Goryavsky
2021-12-23 14:14:04 +01:00
parent a5ef74e7eb 12087d6757
commit 3376668ca8
28 changed files with 385 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/mysql_upgrade_service.cc
View File

@ -551,8 +551,8 @@ int main(int argc, char **argv)
if (WaitForSingleObject(mysqld_process, 0) != WAIT_TIMEOUT)
die("mysqld.exe did not start");
if (run_tool(P_WAIT, mysqladmin_path, "--protocol=pipe",
socket_param, "ping", NULL) == 0)
if (run_tool(P_WAIT, mysqladmin_path, "--protocol=pipe", socket_param,
"ping", "--no-beep", NULL) == 0)
{
break;
}