Server crashes when accessing incorrect MERGE table from trigger

CREATE TABLE t1(a INT);
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);

--error ER_WRONG_MRG_TABLE
DELETE FROM t1;

Found while merging MDEV-4879 - Merge test cases for new CREATE TEMPORARY TABLE privilege model. When this bug is fixed, uncomment appropriate lines in merge.test.

The most likely reason is that revision dmitry.lenev@oracle.com-20110722123110-g3bzpbh90dje1ryk wasn't properly merged. This revision is targeted for mysql-5.5, mysql-5.6 has different fix.