diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-15 19:13:32 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-15 19:13:32 +0100 |
| commit | d3935adf7a4ea943583e9e51fe8fa8a2c14521dd (patch) | |
| tree | 4125365a32fa25dde9e79ccfb4dcd10269071607 /sql/sql_help.cc | |
| parent | 85ea99dcaf8fd91fa566a78062dbfa416c2309fe (diff) | |
| parent | 14ba37f76f87cc48cae62eb6bdf3cda294dff78d (diff) | |
| download | mariadb-git-d3935adf7a4ea943583e9e51fe8fa8a2c14521dd.tar.gz | |
mysql-5.5.29 merge
Diffstat (limited to 'sql/sql_help.cc')
| -rw-r--r-- | sql/sql_help.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sql/sql_help.cc b/sql/sql_help.cc index c352272e95c..458904ebe1d 100644 --- a/sql/sql_help.cc +++ b/sql/sql_help.cc @@ -303,8 +303,14 @@ int get_topics_for_keyword(THD *thd, TABLE *topics, TABLE *relations, rtopic_id= find_fields[help_relation_help_topic_id].field; rkey_id= find_fields[help_relation_help_keyword_id].field; - topics->file->ha_index_init(iindex_topic,1); - relations->file->ha_index_init(iindex_relations,1); + if (topics->file->ha_index_init(iindex_topic,1) || + relations->file->ha_index_init(iindex_relations,1)) + { + if (topics->file->inited) + topics->file->ha_index_end(); + my_message(ER_CORRUPT_HELP_DB, ER(ER_CORRUPT_HELP_DB), MYF(0)); + DBUG_RETURN(-1); + } rkey_id->store((longlong) key_id, TRUE); rkey_id->get_key_image(buff, rkey_id->pack_length(), Field::itRAW); |