Test that all MERGE tables comes from the same database

1 files changed, 5 insertions, 1 deletions

diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test
index 59da525990c..6820242d562 100644
--- a/mysql-test/t/merge.test
+++ b/mysql-test/t/merge.test
@@ -35,9 +35,13 @@ show create table t3;
 
 # The following should give errors
 create table t4 (a int not null, b char(10), key(a)) type=MERGE UNION=(t1,t2);
+--error 1016
+select * from t4;
+--error 1212
+create table t5 (a int not null, b char(10), key(a)) type=MERGE UNION=(test.t1,test_2.t2);
 
 # Because of windows, it's important that we drop the merge tables first!
-drop table if exists t4,t3,t1,t2;
+drop table if exists t5,t4,t3,t1,t2;
 
 create table t1 (c char(10)) type=myisam;
 create table t2 (c char(10)) type=myisam;