Commit f9c24561 authored by msvensson@pilot.(none)'s avatar msvensson@pilot.(none)
Browse files

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

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

client/mysql_upgrade.c

+2 −0
Original line number Diff line number Diff line
@@ -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",