bk commit into 5.0 tree (msvensson:1.2502) BUG#29805

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-08-27 11:31:49+02:00, msvensson@pilot.(none) +1 -0
  Bug#29805 mysql_upgrade test fail if ~/.my.cnf contain a password
   - "mysql" and "mysqlcheck" should not read defaults file

  client/mysql_upgrade.c@stripped, 2007-08-27 11:31:48+02:00, msvensson@pilot.(none) +2 -0
    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)

diff -Nrup a/client/mysql_upgrade.c b/client/mysql_upgrade.c
--- a/client/mysql_upgrade.c	2007-08-27 10:25:33 +02:00
+++ b/client/mysql_upgrade.c	2007-08-27 11:31:48 +02:00
@@ -455,6 +455,7 @@ static int run_query(const char *query, 
 
   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",