Bug#29805 mysql_upgrade test fail if ~/.my.cnf contain a password
- "mysql" and "mysqlcheck" should not read defaults file
This commit is contained in:
parent
a91bd85215
commit
f9c245611e
@ -455,6 +455,7 @@ static int run_query(const char *query, DYNAMIC_STRING *ds_res,
|
||||
|
||||
ret= run_tool(mysql_path,
|
||||
ds_res,
|
||||
"--no-defaults",
|
||||
ds_args.str,
|
||||
"--database=mysql",
|
||||
"--batch", /* Turns off pager etc. */
|
||||
@ -617,6 +618,7 @@ static int run_mysqlcheck_upgrade(void)
|
||||
verbose("Running 'mysqlcheck'...");
|
||||
return run_tool(mysqlcheck_path,
|
||||
NULL, /* Send output from mysqlcheck directly to screen */
|
||||
"--no-defaults",
|
||||
ds_args.str,
|
||||
"--check-upgrade",
|
||||
"--all-databases",
|
||||
|
Loading…
x
Reference in New Issue
Block a user