summaryrefslogtreecommitdiff
path: root/mysql-test/t/merge.test
diff options
context:
space:
mode:
authorJon Olav Hauglid <jon.hauglid@sun.com>2010-06-11 10:14:38 +0200
committerJon Olav Hauglid <jon.hauglid@sun.com>2010-06-11 10:14:38 +0200
commit262bf59a2dc7ca1eed75f0e1ec93ec5e5182f2f9 (patch)
treeb45ccd27fb72894cdf3dca4cb5d59a5553f2ced1 /mysql-test/t/merge.test
parent90a87cd52d340abdc0f4b3c7b449426260100db6 (diff)
downloadmariadb-git-262bf59a2dc7ca1eed75f0e1ec93ec5e5182f2f9.tar.gz
This patch backports test coverage for:
Bug #22909 Using CREATE ... LIKE is possible to create field with invalid default value Bug #35935 CREATE TABLE under LOCK TABLES ignores FLUSH TABLES WITH READ LOCK Bug #37371 CREATE TABLE LIKE merge loses UNION parameter These bugs were originally fixed in the 6.1-fk tree and the fixes were backported as part of the fix for Bug #42546 "Backup: RESTORE fails, thinking it finds an existing table". This patch backports test coverage missing in the original backport. The patch contains no code changes.
Diffstat (limited to 'mysql-test/t/merge.test')
-rw-r--r--mysql-test/t/merge.test15
1 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test
index a9d98da0403..29c0eae1df6 100644
--- a/mysql-test/t/merge.test
+++ b/mysql-test/t/merge.test
@@ -2187,5 +2187,20 @@ UNLOCK TABLES;
DROP TABLE m1, t1;
+--echo #
+--echo # Test for bug #37371 "CREATE TABLE LIKE merge loses UNION parameter"
+--echo #
+--disable_warnings
+drop tables if exists t1, m1, m2;
+--enable_warnings
+create table t1 (i int) engine=myisam;
+create table m1 (i int) engine=mrg_myisam union=(t1) insert_method=first;
+create table m2 like m1;
+--echo # Table definitions should match
+show create table m1;
+show create table m2;
+drop tables m1, m2, t1;
+
+
--echo End of 6.0 tests