summaryrefslogtreecommitdiff
path: root/mysql-test/t/merge.test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/t/merge.test')
-rw-r--r--mysql-test/t/merge.test5
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;