summaryrefslogtreecommitdiff
path: root/mysql-test/r/merge.result
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2009-11-06 18:22:32 +0100
committerunknown <knielsen@knielsen-hq.org>2009-11-06 18:22:32 +0100
commitad368a2b54f4177daf5abd17fa7533f1626f6feb (patch)
treec762060dc3c06f7b35460ef22fecc08cf8adee55 /mysql-test/r/merge.result
parent716c09936365c9cfeb2304ca54ffdd95c1031c6e (diff)
parenta6793a48e20c2aebb1391e2f4f916cf147ff1900 (diff)
downloadmariadb-git-ad368a2b54f4177daf5abd17fa7533f1626f6feb.tar.gz
Merge Mysql 5.1.39 merge into MariaDB trunk
Diffstat (limited to 'mysql-test/r/merge.result')
-rw-r--r--mysql-test/r/merge.result12
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result
index f9f6e1edf6c..e3633404db1 100644
--- a/mysql-test/r/merge.result
+++ b/mysql-test/r/merge.result
@@ -2159,4 +2159,16 @@ ERROR HY000: Table storage engine for 'm1' doesn't have this option
DROP TABLE m1,t1,t2,t3,t4,t5,t6,t7;
SELECT 1 FROM m1;
ERROR 42S02: Table 'test.m1' doesn't exist
+#
+# Bug #46614: Assertion in show_create_trigger()
+#
+CREATE TABLE t1(a int);
+CREATE TABLE t2(a int);
+CREATE TABLE t3(a int) ENGINE = MERGE UNION(t1, t2);
+CREATE TRIGGER tr1 AFTER INSERT ON t3 FOR EACH ROW CALL foo();
+SHOW CREATE TRIGGER tr1;
+Trigger sql_mode SQL Original Statement character_set_client collation_connection Database Collation
+tr1 CREATE DEFINER=`root`@`localhost` TRIGGER tr1 AFTER INSERT ON t3 FOR EACH ROW CALL foo() latin1 latin1_swedish_ci latin1_swedish_ci
+DROP TRIGGER tr1;
+DROP TABLE t1, t2, t3;
End of 5.1 tests