diff options
author | unknown <bell@sanja.is.com.ua> | 2004-05-19 18:13:21 +0300 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2004-05-19 18:13:21 +0300 |
commit | a63184a6a353ef26d87b554e5df17bbeddfb1ca4 (patch) | |
tree | 8dcb277c0835f0811cefea7c3a3b34f1eca6fdc3 /sql/sql_union.cc | |
parent | efcb7706c4d6b43cce8fd392b698ecc5d37a6c43 (diff) | |
download | mariadb-git-a63184a6a353ef26d87b554e5df17bbeddfb1ca4.tar.gz |
after merge fix
sql/sql_union.cc:
describe should go until the end
Diffstat (limited to 'sql/sql_union.cc')
-rw-r--r-- | sql/sql_union.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index ec1abc57a51..e56dd4b476e 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -361,7 +361,8 @@ int st_select_lex_unit::exec() item->reset(); table->file->delete_all_rows(); } - if (union_distinct && table->file->enable_indexes(HA_KEY_SWITCH_ALL)) + 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()) { |