Fix UNION

New faster list iterators
Change list code to be simpler and faster
Optimize count(distinct)
New error messages for UNION
Make create_tmp_table more general to be usable by UNION

1 files changed, 29 insertions, 0 deletions

diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test
new file mode 100644
index 00000000000..b831be7db28
--- /dev/null
+++ b/mysql-test/t/union.test
@@ -0,0 +1,29 @@
+#
+# Test of unions
+#
+
+drop table if exists t1,t2;
+CREATE TABLE t1 (a int not null, b char (10) not null);
+insert into t1 values(1,'a'),(2,'b'),(3,'c'),(3,'c');
+CREATE TABLE t2 (a int not null, b char (10) not null);
+insert into t2 values (3,'c'),(4,'d'),(5,'f'),(6,'e');
+
+select a,b from t1 union select a,b from t2;
+select a,b from t1 union all select a,b from t2;
+select a,b from t1 union all select a,b from t2 order by b;
+select a,b from t1 union all select a,b from t2 union select 7,'g';
+select 0,'#' union select a,b from t1 union all select a,b from t2 union select 7,'gg';
+select a,b from t1 union select a,b from t1;
+select 't1',b,count(*) from t1 group by b UNION select 't2',b,count(*) from t2 group by b;
+
+explain select a,b from t1 union all select a,b from t2;
+
+# Test some error conditions with UNION
+--error 1213
+select a,b from t1 into outfile 'skr' union select a,b from t2;
+--error 1213
+select a,b from t1 order by a union select a,b from t2;
+--error 1214
+select a,b from t1 union select a from t2;
+
+drop table t1,t2;