mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
Post-merge fix: Silence warning due to type mismatch.
This commit is contained in:
parent
a3b0b7bbdb
commit
bafa07b2c4
1 changed files with 6 additions and 4 deletions
|
@ -364,6 +364,8 @@ static void find_tool(char *tool_executable_name, const char *tool_name,
|
|||
}
|
||||
else
|
||||
{
|
||||
int len;
|
||||
|
||||
/*
|
||||
mysql_upgrade was run absolutely or relatively. We can find a sibling
|
||||
by replacing our name after the LIBCHAR with the new tool name.
|
||||
|
@ -385,10 +387,10 @@ static void find_tool(char *tool_executable_name, const char *tool_name,
|
|||
last_fn_libchar -= 6;
|
||||
}
|
||||
|
||||
len= last_fn_libchar - self_name;
|
||||
|
||||
my_snprintf(tool_executable_name, FN_REFLEN, "%.*s%c%s",
|
||||
(last_fn_libchar - self_name), self_name,
|
||||
FN_LIBCHAR,
|
||||
tool_name);
|
||||
len, self_name, FN_LIBCHAR, tool_name);
|
||||
}
|
||||
|
||||
verbose("Looking for '%s' as: %s", tool_name, tool_executable_name);
|
||||
|
|
Loading…
Reference in a new issue