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

auto merge 5.1-main --> 5.1-bugteam

This commit is contained in:
Gleb Shchepa
2008-06-25 14:44:55 +05:00
14 changed files with 340 additions and 241 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;
}