bzr commit into mysql-5.1-bugteam branch (holyfoot:2733) Bug#35934

[Alexey Botchkov]

#At file:///home/hf/work/mysql_common/51mrg/

 2733 Alexey Botchkov	2008-12-09
      Bug#35934      mysql_upgrade calls mysqlcheck with insufficient parameters
          modifying the original fix.
          As it turned out --fix-db-names option of the mysqlcheck suppress
          the --check_upgrade option, so we have to call the mysqlcheck twice
          from the mysql_upgrade.
      
      per-file comments:
        client/mysql_upgrade.c
      Bug#35934      mysql_upgrade calls mysqlcheck with insufficient parameters
modified:
  client/mysql_upgrade.c

=== modified file 'client/mysql_upgrade.c'
--- a/client/mysql_upgrade.c	2008-12-08 11:41:45 +0000
+++ b/client/mysql_upgrade.c	2008-12-09 08:30:49 +0000
@@ -616,6 +616,18 @@ static int run_mysqlcheck_upgrade(void)
                   "--check-upgrade",
                   "--all-databases",
                   "--auto-repair",
+                  NULL);
+}
+
+
+static int run_mysqlcheck_fixnames(void)
+{
+  verbose("Running 'mysqlcheck'...");
+  return run_tool(mysqlcheck_path,
+                  NULL, /* Send output from mysqlcheck directly to screen */
+                  "--no-defaults",
+                  ds_args.str,
+                  "--all-databases",
                   "--fix-db-names",
                   "--fix-table-names",
                   NULL);
@@ -784,7 +796,8 @@ int main(int argc, char **argv)
   /*
     Run "mysqlcheck" and "mysql_fix_privilege_tables.sql"
   */
-  if (run_mysqlcheck_upgrade() ||
+  if (run_mysqlcheck_fixnames() ||
+      run_mysqlcheck_upgrade() ||
       run_sql_fix_privilege_tables())
   {
     /*