summaryrefslogtreecommitdiff
path: root/sql/mysql_upgrade_service.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-11-19 10:45:28 +0800
committerMarko Mäkelä <marko.makela@mariadb.com>2019-11-19 10:45:28 +0800
commita9846f329935faba560387bab8fd897102e17385 (patch)
tree2734986279de4dbea54be2dda25c994fd99498a8 /sql/mysql_upgrade_service.cc
parent6d373e8b817861d3fd3cb181c02d45d2874d5a27 (diff)
parent589a1235b64866c7bbe85da2a6f6bf19ee8282fe (diff)
downloadmariadb-git-a9846f329935faba560387bab8fd897102e17385.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'sql/mysql_upgrade_service.cc')
-rw-r--r--sql/mysql_upgrade_service.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysql_upgrade_service.cc b/sql/mysql_upgrade_service.cc
index b612f31a289..dc4b2d0923c 100644
--- a/sql/mysql_upgrade_service.cc
+++ b/sql/mysql_upgrade_service.cc
@@ -511,8 +511,8 @@ int main(int argc, char **argv)
die("Cannot start mysqld.exe process, last error =%u", GetLastError());
}
char pipe_name[64];
- snprintf(pipe_name, sizeof(pipe_name), "\\\\.\\pipe\\mysql_upgrade_service_%u",
- (uint)GetCurrentProcessId());
+ snprintf(pipe_name, sizeof(pipe_name), "\\\\.\\pipe\\mysql_upgrade_service_%lu",
+ GetCurrentProcessId());
for (;;)
{
if (WaitForSingleObject(mysqld_process, 0) != WAIT_TIMEOUT)