mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
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)
This commit is contained in:
@@ -455,6 +455,7 @@ static int run_query(const char *query, DYNAMIC_STRING *ds_res,
|
|||||||
|
|
||||||
ret= run_tool(mysql_path,
|
ret= run_tool(mysql_path,
|
||||||
ds_res,
|
ds_res,
|
||||||
|
"--no-defaults",
|
||||||
ds_args.str,
|
ds_args.str,
|
||||||
"--database=mysql",
|
"--database=mysql",
|
||||||
"--batch", /* Turns off pager etc. */
|
"--batch", /* Turns off pager etc. */
|
||||||
@@ -617,6 +618,7 @@ static int run_mysqlcheck_upgrade(void)
|
|||||||
verbose("Running 'mysqlcheck'...");
|
verbose("Running 'mysqlcheck'...");
|
||||||
return run_tool(mysqlcheck_path,
|
return run_tool(mysqlcheck_path,
|
||||||
NULL, /* Send output from mysqlcheck directly to screen */
|
NULL, /* Send output from mysqlcheck directly to screen */
|
||||||
|
"--no-defaults",
|
||||||
ds_args.str,
|
ds_args.str,
|
||||||
"--check-upgrade",
|
"--check-upgrade",
|
||||||
"--all-databases",
|
"--all-databases",
|
||||||
|
Reference in New Issue
Block a user