Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint

into mysql.com:/home/ram/work/b29980/b29980.5.1

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into mysql.com:/home/ram/work/b29980/b29980.5.1
bc15820d · ramil/ram@ramil.myoffice.izhnet.ru · 6570f5e0 · 13358407 · bc15820d
Commit bc15820d authored Jul 27, 2007 by ramil/ram@ramil.myoffice.izhnet.ru
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sql/sql_table.cc sql/sql_table.cc +2 -1

No files found.
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -4132,7 +4132,8 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
        goto err;
    }

-    if (operator_func == &handler::ha_repair)
+    if (operator_func == &handler::ha_repair &&
+        !(check_opt->sql_flags & TT_USEFRM))
    {
      if ((table->table->file->check_old_types() == HA_ADMIN_NEEDS_ALTER) ||
          (table->table->file->ha_check_for_upgrade(check_opt) ==