diff options
| author | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2021-12-26 12:51:04 +0100 |
|---|---|---|
| committer | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2021-12-26 12:51:04 +0100 |
| commit | 55bb933a880bf048ebc4ce6c6e239dcc8268958d (patch) | |
| tree | a3a24c56995df41758205f8f6a4e3cbccf793a19 /sql/mysql_upgrade_service.cc | |
| parent | be20b3b03f9c522d17b3454214981506549063eb (diff) | |
| parent | 681b7784b6bb3d735d0a745f5891844f43becc90 (diff) | |
| download | mariadb-git-55bb933a880bf048ebc4ce6c6e239dcc8268958d.tar.gz | |
Merge branch 10.4 into 10.5st-10.5-julius
Diffstat (limited to 'sql/mysql_upgrade_service.cc')
| -rw-r--r-- | sql/mysql_upgrade_service.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysql_upgrade_service.cc b/sql/mysql_upgrade_service.cc index 19dbf93c7ce..7438ab131ea 100644 --- a/sql/mysql_upgrade_service.cc +++ b/sql/mysql_upgrade_service.cc @@ -549,8 +549,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; } |