Commit 6fdcb4c7 authored by unknown's avatar unknown

Bug#29805 mysql_upgrade test fail if ~/.my.cnf contain a password

 - "mysql" and "mysqlcheck" should not read defaults file


client/mysql_upgrade.c:
  Instruct "mysql" and "mysqlcheck" that is invoked by "mysql_upgrade" not
  to read defaults file, they should get all the parameters they need from
  mysql_upgrade(that read the default file)
parent bd55d4f1
......@@ -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",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment