From f9c245611ecedcaa320442ccb306400653f15e9d Mon Sep 17 00:00:00 2001 From: "msvensson@pilot.(none)" <> Date: Mon, 27 Aug 2007 11:31:49 +0200 Subject: [PATCH] Bug#29805 mysql_upgrade test fail if ~/.my.cnf contain a password - "mysql" and "mysqlcheck" should not read defaults file --- client/mysql_upgrade.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 630267f1a5e..fb30c6f2613 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -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",