diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2004-05-15 18:30:04 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2004-05-15 18:30:04 +0300 |
| commit | d146ea1a0f442e2e3410763051a752f81f03525e (patch) | |
| tree | 756dca2f742cdf767c4fe273a717acff345024d4 /sql/sql_union.cc | |
| parent | 36bce251128b8fd300c4a6329d0c2d8f601a14bc (diff) | |
| parent | 90e87293cbc9489ffc51a8883087398564579067 (diff) | |
| download | mariadb-git-d146ea1a0f442e2e3410763051a752f81f03525e.tar.gz | |
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
sql/sql_union.cc:
Auto merged
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index de3eeec0db0..165c19ec61a 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -339,8 +339,8 @@ int st_select_lex_unit::exec() item->reset(); table->file->delete_all_rows(); } - if (union_distinct) // for subselects - table->file->extra(HA_EXTRA_CHANGE_KEY_TO_UNIQUE); + if (union_distinct && table->file->enable_indexes(HA_KEY_SWITCH_ALL)) + DBUG_RETURN(1); // For sub-selects for (SELECT_LEX *sl= select_cursor; sl; sl= sl->next_select()) { ha_rows records_at_start= 0; @@ -392,7 +392,11 @@ int st_select_lex_unit::exec() records_at_start= table->file->records; sl->join->exec(); if (sl == union_distinct) - table->file->extra(HA_EXTRA_CHANGE_KEY_TO_DUP); + { + if (table->file->disable_indexes(HA_KEY_SWITCH_ALL)) + DBUG_RETURN(1); + table->no_keyread=1; + } res= sl->join->error; offset_limit_cnt= sl->offset_limit; if (!res && union_result->flush()) |