summaryrefslogtreecommitdiff
path: root/mysql-test/t/merge.test
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-09-27 09:21:19 +0200
committerSergei Golubchik <serg@mariadb.org>2016-09-27 09:21:19 +0200
commit77ce4ead811b606540b9a2cf6d9ce3146a91ab0f (patch)
tree5dcd215abf7afd125ad5744697565121b954c1b2 /mysql-test/t/merge.test
parent677c44f0c37973ad70550d9b807781e688764fae (diff)
parentd61e5260fb9983ea8dff539b23a6d0a150c2065c (diff)
downloadmariadb-git-77ce4ead811b606540b9a2cf6d9ce3146a91ab0f.tar.gz
Merge branch '5.5' into 10.0
Diffstat (limited to 'mysql-test/t/merge.test')
-rw-r--r--mysql-test/t/merge.test13
1 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test
index 77e896c7c05..0cf37a24f8e 100644
--- a/mysql-test/t/merge.test
+++ b/mysql-test/t/merge.test
@@ -2880,6 +2880,19 @@ drop tables m1, t1, t4;
drop view t3;
+--echo #
+--echo # MDEV-10424 - Assertion `ticket == __null' failed in
+--echo # MDL_request::set_type
+--echo #
+CREATE TABLE t1 (f1 INT) ENGINE=MyISAM;
+CREATE TABLE tmerge (f1 INT) ENGINE=MERGE UNION=(t1);
+PREPARE stmt FROM "ANALYZE TABLE tmerge, t1";
+EXECUTE stmt;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
+DROP TABLE t1, tmerge;
+
+
--echo End of 5.5 tests