after merge fix

192eb65e · bell@sanja.is.com.ua · bd010b1e · 192eb65e
Commit 192eb65e authored May 19, 2004 by bell@sanja.is.com.ua
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sql/sql_union.cc sql/sql_union.cc +2 -1

No files found.
--- 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())
    {