Backport compiler warning fix from 5.1-bugteam.
This commit is contained in:
parent
6c93f05a66
commit
fe39a901bb
@ -364,7 +364,9 @@ static void find_tool(char *tool_executable_name, const char *tool_name,
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/*
|
int len;
|
||||||
|
|
||||||
|
/*
|
||||||
mysql_upgrade was run absolutely or relatively. We can find a sibling
|
mysql_upgrade was run absolutely or relatively. We can find a sibling
|
||||||
by replacing our name after the LIBCHAR with the new tool name.
|
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;
|
last_fn_libchar -= 6;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
len= last_fn_libchar - self_name;
|
||||||
|
|
||||||
my_snprintf(tool_executable_name, FN_REFLEN, "%.*s%c%s",
|
my_snprintf(tool_executable_name, FN_REFLEN, "%.*s%c%s",
|
||||||
(last_fn_libchar - self_name), self_name,
|
len, self_name, FN_LIBCHAR, tool_name);
|
||||||
FN_LIBCHAR,
|
|
||||||
tool_name);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
verbose("Looking for '%s' as: %s", tool_name, tool_executable_name);
|
verbose("Looking for '%s' as: %s", tool_name, tool_executable_name);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user