diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-29 15:10:47 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-29 15:10:47 +0100 |
| commit | 0af4b6c6ee2b8a61823478c0a56ebdfa52cae3cc (patch) | |
| tree | 7b24eb150b9cca718c88edaabbfc6c8bb16fd015 /sql/sql_help.cc | |
| parent | cf20de000bdff07a34a373079991d24837423896 (diff) | |
| parent | 52fbe44fbbe60ecaba6453884ec1ad32755d7a04 (diff) | |
| download | mariadb-git-0af4b6c6ee2b8a61823478c0a56ebdfa52cae3cc.tar.gz | |
5.5 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); |