database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

asserting table->file->enable_indexes() in union re-execution

Browse Source
This commit is contained in:
serg@serg.mylan
2004-05-21 09:31:28 +02:00
parent 40711b570a
commit 11128fb672
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sql/sql_union.cc
View File

@ -355,15 +355,18 @@ int st_select_lex_unit::exec()
if (uncacheable || !item || !item->assigned() || describe) if (uncacheable || !item || !item->assigned() || describe)
{ {
if (optimized && item && item->assigned()) if (optimized && item)
{ {
item->assigned(0); // We will reinit & rexecute unit if (item->assigned())
item->reset(); {
table->file->delete_all_rows(); 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()) for (SELECT_LEX *sl= select_cursor; sl; sl= sl->next_select())
{ {
ha_rows records_at_start= 0; ha_rows records_at_start= 0;