database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

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

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


sql/sql_table.cc:
  Auto merged
This commit is contained in:
unknown
2007-07-27 21:17:05 +05:00
parent 43bc432e8f 365bbf9814
commit f00620ba2a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_table.cc
View File

@@ -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) ==