diff options
| author | Chad MILLER <chad@mysql.com> | 2008-07-14 16:16:37 -0400 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2008-07-14 16:16:37 -0400 |
| commit | dae4c823e96ee514334a65de01b10c479b671bd0 (patch) | |
| tree | 6009880c2c51b3422d95a760220fb7a20ebdb3e0 /sql/sql_table.cc | |
| parent | c94a46240a912bd71d6ec961132ae3e6f4746bd5 (diff) | |
| parent | 443698a56d078915cc31850b40d7ae3206cda29e (diff) | |
| download | mariadb-git-dae4c823e96ee514334a65de01b10c479b671bd0.tar.gz | |
Merge from 5.0 trunk.
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 48bdfd87f9f..accd943a05b 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -2118,6 +2118,13 @@ static int prepare_for_repair(THD* thd, TABLE_LIST *table_list, const char **ext= table->file->bas_ext(); MY_STAT stat_info; + if (table->s->frm_version != FRM_VER_TRUE_VARCHAR) + { + error= send_check_errmsg(thd, table_list, "repair", + "Failed reparing incompatible .FRM file"); + goto end; + } + /* Check if this is a table type that stores index and data separately, like ISAM or MyISAM. We assume fixed order of engine file name |