Merge sinisa@work.mysql.com:/home/bk/mysql

into sinisa.nasamreza.org:/mnt/work/mysql

2 files changed, 25 insertions, 0 deletions

diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result
index 653e25af799..bdde202b335 100644
--- a/mysql-test/r/merge.result
+++ b/mysql-test/r/merge.result
@@ -130,3 +130,9 @@ a
 a	b
 1	1
 1	2
+a
+1
+2
+a
+1
+2
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test
index 238dd599664..6ea9ecc269f 100644
--- a/mysql-test/t/merge.test
+++ b/mysql-test/t/merge.test
@@ -114,3 +114,22 @@ insert into t2 values (1,1),(2,2),(0,0),(4,4),(5,5),(6,6);
 flush tables;
 select * from t3 where a=1 order by b limit 2;
 drop table t3,t1,t2;
+
+#
+# temporary merge tables
+#
+drop table if exists t1, t2, t3, t4, t5, t6;
+create table t1 (a int not null);
+create table t2 (a int not null);
+insert into t1 values (1);
+insert into t2 values (2);
+create temporary table t3 (a int not null) TYPE=MERGE UNION=(t1,t2);
+select * from t3;
+create temporary table t4 (a int not null);
+create temporary table t5 (a int not null);
+insert into t4 values (1);
+insert into t5 values (2);
+create temporary table t6 (a int not null) TYPE=MERGE UNION=(t4,t5);
+select * from t6;
+drop table if exists t1, t2, t3, t4, t5, t6;
+