summaryrefslogtreecommitdiff
path: root/mysql-test/r/delete.result
diff options
context:
space:
mode:
authorAlexey Kopytov <Alexey.Kopytov@Sun.com>2009-11-24 11:31:36 +0300
committerAlexey Kopytov <Alexey.Kopytov@Sun.com>2009-11-24 11:31:36 +0300
commitadb89e98aaa8b00b3efb7a56aebdaf12c5e75ee4 (patch)
treec7017f926485e3c5647276d684f4adc4847f9faf /mysql-test/r/delete.result
parentbc014badaf78cd057018a7db6a9857b584b932b3 (diff)
parentfad34c34cf22eb1c503204aee204dfb83ad7acea (diff)
downloadmariadb-git-adb89e98aaa8b00b3efb7a56aebdaf12c5e75ee4.tar.gz
Manual merge from the mysql-5.1-bugteam.
Diffstat (limited to 'mysql-test/r/delete.result')
-rw-r--r--mysql-test/r/delete.result13
1 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/r/delete.result b/mysql-test/r/delete.result
index 0124a7da35a..1df19a75854 100644
--- a/mysql-test/r/delete.result
+++ b/mysql-test/r/delete.result
@@ -324,3 +324,16 @@ a
1
2
DROP TABLE t1, t2, t3;
+#
+# Bug #46425 crash in Diagnostics_area::set_ok_status,
+# empty statement, DELETE IGNORE
+#
+CREATE table t1 (i INTEGER);
+INSERT INTO t1 VALUES (1);
+CREATE TRIGGER tr1 AFTER DELETE ON t1 FOR EACH ROW
+BEGIN
+INSERT INTO t1 SELECT * FROM t1 AS A;
+END |
+DELETE IGNORE FROM t1;
+ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
+DROP TABLE t1;