auto merge 5.1-main --> 5.1-bugteam

This commit is contained in:
Gleb Shchepa 2008-06-25 14:44:55 +05:00
commit 696c03e47c
14 changed files with 342 additions and 243 deletions

View file

@ -4024,7 +4024,7 @@ static int prepare_for_repair(THD *thd, TABLE_LIST *table_list,
if (table->s->frm_version != FRM_VER_TRUE_VARCHAR)
{
error= send_check_errmsg(thd, table_list, "repair",
"Failed reparing incompatible .FRM file");
"Failed repairing incompatible .frm file");
goto end;
}