diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-26 14:27:24 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-26 14:27:24 -0400 |
| commit | 90e4f7f9d3f2669ac99f2817f884315bfc86b0a7 (patch) | |
| tree | 60a10a515a9f5656e797d8142f97b94f89f4e797 /sql/sql_admin.cc | |
| parent | 586fab72f01e1c7f0f8bf363fa6b06a2f10965b4 (diff) | |
| parent | 5b7cab82195268f7657504d0b53995654748cefa (diff) | |
| download | mariadb-git-90e4f7f9d3f2669ac99f2817f884315bfc86b0a7.tar.gz | |
* bzr merge -rtag:mariadb-10.0.9 maria/10.0
* Fix for post-merge build failures.
Diffstat (limited to 'sql/sql_admin.cc')
| -rw-r--r-- | sql/sql_admin.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc index 3f5ae79299d..6989b76accb 100644 --- a/sql/sql_admin.cc +++ b/sql/sql_admin.cc @@ -163,10 +163,11 @@ static int prepare_for_repair(THD *thd, TABLE_LIST *table_list, - Run a normal repair using the new index file and the old data file */ - if (table->s->frm_version != FRM_VER_TRUE_VARCHAR) + if (table->s->frm_version != FRM_VER_TRUE_VARCHAR && + table->s->varchar_fields) { error= send_check_errmsg(thd, table_list, "repair", - "Failed repairing incompatible .frm file"); + "Failed repairing a very old .frm file as the data file format has changed between versions. Please dump the table in your old system with mysqldump and read it into this system with mysql or mysqlimport"); goto end; } @@ -1222,7 +1223,7 @@ bool Sql_cmd_repair_table::execute(THD *thd) WSREP_TO_ISOLATION_BEGIN(first_table->db, first_table->table_name, NULL) res= mysql_admin_table(thd, first_table, &m_lex->check_opt, "repair", TL_WRITE, 1, - test(m_lex->check_opt.sql_flags & TT_USEFRM), + MY_TEST(m_lex->check_opt.sql_flags & TT_USEFRM), HA_OPEN_FOR_REPAIR, &prepare_for_repair, &handler::ha_repair, 0); |