diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2013-10-14 12:36:31 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2013-10-14 12:36:31 +0400 |
| commit | 2c0a073970cf5f1dc679b34bb13e7fc55109dfd0 (patch) | |
| tree | 88064e3042b832b38bc6473cb437c9b4d37da643 /mysql-test/r/merge.result | |
| parent | c776f5ac2614e24e64dd06f488ee29716f056c95 (diff) | |
| download | mariadb-git-2c0a073970cf5f1dc679b34bb13e7fc55109dfd0.tar.gz | |
MDEV-5042 - Server crashes when accessing incorrect MERGE table from trigger
When we open merge children open error is normally handled early during
open phase. But there are two exceptions when error is handled later during
attach phase: CHECK/REPAIR TABLE and tables added by the pre-locking code.
The latter case wasn't considered by assertion in the merge code. This
assertion is corrected. Note that in MySQL-5.6 this assertion is removed.
Diffstat (limited to 'mysql-test/r/merge.result')
| -rw-r--r-- | mysql-test/r/merge.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index 7cb9e5bb423..f806829b969 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -3910,6 +3910,8 @@ CREATE TABLE m1(a INT) ENGINE = MERGE UNION (q1, q2); CREATE TRIGGER trg1 BEFORE DELETE ON t1 FOR EACH ROW INSERT INTO m1 VALUES (1); +DELETE FROM t1; +ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist DROP TRIGGER trg1; DROP TABLE t1; DROP TABLE m1; |