diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-28 17:55:28 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-28 17:55:28 +0200 |
| commit | 66d9696596edbc20ad36bf3d5bffb5595e8235c3 (patch) | |
| tree | bbef37c9a90b63d25bee59386cac04298a13846f /mysql-test/t/merge.test | |
| parent | 66a58f46e937cdc3d7e0529b52ad8b658d9b2cd4 (diff) | |
| parent | 23af6f5942e7235a7c14a36cb8dd0d2796b5ef37 (diff) | |
| download | mariadb-git-66d9696596edbc20ad36bf3d5bffb5595e8235c3.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'mysql-test/t/merge.test')
| -rw-r--r-- | mysql-test/t/merge.test | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index 519094d6350..e9d69b446d5 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -2881,6 +2881,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 |