From a078f131215320b8b85081b878154909e9bb76e2 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Wed, 19 Oct 2011 22:52:43 +0200
Subject: [PATCH] don't forget to call ha_index_end before destroying the
 handler

---
 sql/sql_expression_cache.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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;
 }