diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-01-04 10:30:45 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-01-04 10:30:45 +0200 |
| commit | daf4fa5238a67fcf47075721d86d4348adab687b (patch) | |
| tree | fff85b8f2e11607c93d806e787475ad82f5055f6 /sql/mysql_upgrade_service.cc | |
| parent | 756568f26c6a23c537f4d93ff00f485c6291c92e (diff) | |
| parent | 7dfaded9625e832fade4ef1678bcb21c445dad2b (diff) | |
| download | mariadb-git-st-10.8-merge.tar.gz | |
Merge 10.7 into 10.8st-10.8-merge
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; } |