summaryrefslogtreecommitdiff
path: root/sql/sql_expression_cache.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-10-19 22:52:43 +0200
committerSergei Golubchik <sergii@pisem.net>2011-10-19 22:52:43 +0200
commita078f131215320b8b85081b878154909e9bb76e2 (patch)
treecc51a9e444d01b9e90cd41981f63fdf76c375fe7 /sql/sql_expression_cache.cc
parentd649d0cc8cfec03e2f4d4a8e44f334124e743af8 (diff)
downloadmariadb-git-a078f131215320b8b85081b878154909e9bb76e2.tar.gz
don't forget to call ha_index_end before destroying the handler
Diffstat (limited to 'sql/sql_expression_cache.cc')
-rw-r--r--sql/sql_expression_cache.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_expression_cache.cc b/sql/sql_expression_cache.cc
index 3be6dea7df9..e65ec3c22b0 100644
--- a/sql/sql_expression_cache.cc
+++ b/sql/sql_expression_cache.cc
@@ -56,7 +56,8 @@ Expression_cache_tmptable::Expression_cache_tmptable(THD *thd,
void Expression_cache_tmptable::disable_cache()
{
- cache_table->file->ha_index_end();
+ if (cache_table->file->inited)
+ cache_table->file->ha_index_end();
free_tmp_table(table_thd, cache_table);
cache_table= NULL;
}