List:Commits« Previous MessageNext Message »
From:Alexey Botchkov Date:December 9 2008 8:46am
Subject:bzr push into mysql-6.0-bugteam branch (holyfoot:2784 to 2785)
View as plain text  
 2785 Alexey Botchkov	2008-12-09 [merge]
      merging
modified:
  client/mysql_upgrade.c

 2784 Sergey Glukhov	2008-12-09 [merge]
      5.1-bugteam->6.0-bugteam merge
modified:
  extra/yassl/include/openssl/ssl.h
  mysql-test/r/myisampack.result
  mysql-test/r/type_float.result
  mysql-test/t/myisampack.test
  mysql-test/t/type_float.test
  sql/mysql_priv.h
  sql/sql_table.cc

=== 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())
   {
     /*

Thread
bzr push into mysql-6.0-bugteam branch (holyfoot:2784 to 2785) Alexey Botchkov9 Dec