diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-04-07 17:27:00 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-04-07 17:27:00 -0700 |
| commit | cdf7ce0a2e4aab87a20ff551cf2ee907dee2ea1a (patch) | |
| tree | fbca3d5a33c0b6aab8686a047a73d48a26d29d71 | |
| parent | 00052d8aa7b93b1176009b4fef1448afc3d8eeb2 (diff) | |
| download | mariadb-git-cdf7ce0a2e4aab87a20ff551cf2ee907dee2ea1a.tar.gz | |
Fixed LP bug #972943 properly.mariadb-5.3.6
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.
| -rw-r--r-- | sql/item_subselect.cc | 3 | ||||
| -rw-r--r-- | sql/sql_select.cc | 1 |
2 files changed, 0 insertions, 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 */ |