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/t/merge.test | |
| 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/t/merge.test')
| -rw-r--r-- | mysql-test/t/merge.test | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index 18ec2b3d62f..959c7258a53 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -2945,9 +2945,8 @@ CREATE TRIGGER trg1 BEFORE DELETE ON t1 FOR EACH ROW INSERT INTO m1 VALUES (1); -# Uncomment the following to lines when MDEV-5042 is fixed. -#--error ER_WRONG_MRG_TABLE -#DELETE FROM t1; +--error ER_WRONG_MRG_TABLE +DELETE FROM t1; DROP TRIGGER trg1; DROP TABLE t1; |