From c0a9df1aaedc4a44299398b858021d49ccbfd2ea Mon Sep 17 00:00:00 2001
From: unknown <serg@serg.mylan>
Date: Tue, 23 Mar 2004 14:43:24 +0100
Subject: correct support for a mix of UNION/UNION ALL in the same query.
 Bug#1428

---
 sql/sql_derived.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/sql_derived.cc')

diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc
index 4bfb8cdfe3c..ea47ca9f71d 100644
--- a/sql/sql_derived.cc
+++ b/sql/sql_derived.cc
@@ -138,7 +138,7 @@ static int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit,
   */
   if (!(table= create_tmp_table(thd, &derived_result->tmp_table_param,
 				unit->types, (ORDER*) 0, 
-				is_union && !unit->union_option, 1,
+				is_union && unit->union_distinct, 1,
 				(first_select->options | thd->options |
 				 TMP_TABLE_ALL_COLUMNS),
 				HA_POS_ERROR,
-- 
cgit v1.2.1