From f081107fe01a1d9a6d7d88e3d9c7c5e99aec8144 Mon Sep 17 00:00:00 2001 From: Igor Babaev Date: Sat, 7 Apr 2012 17:27:00 -0700 Subject: [PATCH] Fixed LP bug #972943 properly. The previous patch for the bug (that erroneously identified the bug as bug 972973 in its comment) was incorrect. It turned out that the code that triggered the abort complain reported for the bug was not needed at all. --- sql/item_subselect.cc | 3 --- sql/sql_select.cc | 1 - 2 files changed, 4 deletions(-) diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index a1059f68097..8b720b350a5 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -2726,9 +2726,6 @@ bool subselect_union_engine::no_rows() void subselect_uniquesubquery_engine::cleanup() { DBUG_ENTER("subselect_uniquesubquery_engine::cleanup"); - /* Tell handler we don't need the index anymore */ - if (tab->table->file && tab->table->file->inited) - tab->table->file->ha_index_end(); DBUG_VOID_RETURN; } diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 1049fc93d01..a29b6f90be0 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -15116,7 +15116,6 @@ free_tmp_table(THD *thd, TABLE *entry) else entry->file->ha_delete_table(entry->s->table_name.str); delete entry->file; - entry->file= 0; } /* free blobs */