From 2d3076b69dd48416cc103837da19b40862cf878d Mon Sep 17 00:00:00 2001
From: "bell@sanja.is.com.ua" <>
Date: Mon, 14 Feb 2005 02:06:21 +0200
Subject: [PATCH] removed wrong distinct UNION detection (BUG#6565)

---
 mysql-test/r/derived.result | 19 +++++++++++++++++++
 mysql-test/t/derived.test   | 12 ++++++++++++
 sql/sql_derived.cc          | 10 ++++++++--
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/derived.result b/mysql-test/r/derived.result
index 61d745d0236..b4d9a921178 100644
--- a/mysql-test/r/derived.result
+++ b/mysql-test/r/derived.result
@@ -339,3 +339,22 @@ select distinct sum(b) from (select a,b from t1) y group by a;
 sum(b)
 4
 drop table t1;
+create table t1(a int);
+create table t2(a int);
+create table t3(a int);
+insert into t1 values(1),(1);
+insert into t2 values(2),(2);
+insert into t3 values(3),(3);
+select * from t1 union distinct select * from t2 union all select * from t3;
+a
+1
+2
+3
+3
+select * from (select * from t1 union distinct select * from t2 union all select * from t3) X;
+a
+1
+2
+3
+3
+drop table t1, t2, t3;
diff --git a/mysql-test/t/derived.test b/mysql-test/t/derived.test
index 8b322746ed6..bd27e0654e0 100644
--- a/mysql-test/t/derived.test
+++ b/mysql-test/t/derived.test
@@ -224,3 +224,15 @@ select distinct sum(b) from t1 group by a;
 select distinct sum(b) from (select a,b from t1) y group by a;
 drop table t1;
 
+#
+# test of union subquery in the FROM clause with complex distinct/all (BUG#6565)
+#
+create table t1(a int);
+create table t2(a int);
+create table t3(a int);
+insert into t1 values(1),(1);
+insert into t2 values(2),(2);
+insert into t3 values(3),(3);
+select * from t1 union distinct select * from t2 union all select * from t3;
+select * from (select * from t1 union distinct select * from t2 union all select * from t3) X;
+drop table t1, t2, t3;
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc
index 9475ec08c96..3e627243b9f 100644
--- a/sql/sql_derived.cc
+++ b/sql/sql_derived.cc
@@ -132,10 +132,16 @@ static int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit,
   /*
     Temp table is created so that it hounours if UNION without ALL is to be 
     processed
+
+    As 'distinct' parameter we always pass FALSE (0), because underlying
+    query will control distinct condition by itself. Correct test of
+    distinct underlying query will be is_union &&
+    !unit->union_distinct->next_select() (i.e. it is union and last distinct
+    SELECT is last SELECT of UNION).
   */
   if (!(table= create_tmp_table(thd, &derived_result->tmp_table_param,
-				unit->types, (ORDER*) 0, 
-				is_union && unit->union_distinct, 1,
+				unit->types, (ORDER*) 0,
+				FALSE, 1,
 				(first_select->options | thd->options |
 				 TMP_TABLE_ALL_COLUMNS),
 				HA_POS_ERROR,