From b0528f1a0fdbf251ac58269bc7ffc07277fb0379 Mon Sep 17 00:00:00 2001 From: unknown <serg@serg.mylan> Date: Fri, 21 May 2004 09:31:28 +0200 Subject: [PATCH] asserting table->file->enable_indexes() in union re-execution --- sql/sql_union.cc | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/sql/sql_union.cc b/sql/sql_union.cc index e56dd4b476e..70c05489f82 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -355,15 +355,18 @@ int st_select_lex_unit::exec() if (uncacheable || !item || !item->assigned() || describe) { - if (optimized && item && item->assigned()) + if (optimized && item) { - item->assigned(0); // We will reinit & rexecute unit - item->reset(); - table->file->delete_all_rows(); + if (item->assigned()) + { + item->assigned(0); // We will reinit & rexecute unit + item->reset(); + table->file->delete_all_rows(); + } + /* re-enabling indexes for next subselect iteration */ + if (union_distinct && table->file->enable_indexes(HA_KEY_SWITCH_ALL)) + DBUG_ASSERT(1); } - if (union_distinct && table->file->enable_indexes(HA_KEY_SWITCH_ALL) && - !describe) - DBUG_RETURN(1); // For sub-selects for (SELECT_LEX *sl= select_cursor; sl; sl= sl->next_select()) { ha_rows records_at_start= 0; -- 2.30.9