diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-25 21:57:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-25 21:57:52 +0300 |
| commit | fbe2712705d464bf8488df249c36115e2c1f63f7 (patch) | |
| tree | 274e728c719611769288afcb10f79549f6e11f8c /client/mysql_upgrade.c | |
| parent | 62903434eb009cb0bcd5003b0a45914bd4c09886 (diff) | |
| parent | a19782522b1eac52d72f5e787b5d96f1fd1a2cb7 (diff) | |
| download | mariadb-git-fbe2712705d464bf8488df249c36115e2c1f63f7.tar.gz | |
Merge 10.4 into 10.5
The functional changes of commit 5836191c8f0658d5d75484766fdcc3d838b0a5c1
(MDEV-21168) are omitted due to MDEV-742 having addressed the issue.
Diffstat (limited to 'client/mysql_upgrade.c')
| -rw-r--r-- | client/mysql_upgrade.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 7447a96aecf..9c68aad2746 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -507,7 +507,7 @@ static void find_tool(char *tool_executable_name, const char *tool_name, len= (int)(last_fn_libchar - self_name); - my_snprintf(tool_executable_name, FN_REFLEN, "%.*s%c%s", + my_snprintf(tool_executable_name, FN_REFLEN, "%.*b%c%s", len, self_name, FN_LIBCHAR, tool_name); } |