summaryrefslogtreecommitdiff
path: root/mysql-test/r/trigger.result
diff options
context:
space:
mode:
authorunknown <kroki@mysql.com>2006-06-28 23:54:18 +0400
committerunknown <kroki@mysql.com>2006-06-28 23:54:18 +0400
commit6fa9d07fbaa128eab33d5d16b639ce511e47d3e8 (patch)
treeac329416869abcbf9c30af5b173b13cc6bda51d8 /mysql-test/r/trigger.result
parent17f775917c37c6e5a63f505568b6db6f2857382c (diff)
parent95552a891138dd0ffa0d00e4ec142ae4ef761b0c (diff)
downloadmariadb-git-6fa9d07fbaa128eab33d5d16b639ce511e47d3e8.tar.gz
Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0
into mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug10946 mysql-test/r/trigger.result: Auto merged mysql-test/t/trigger.test: Auto merged sql/sql_trigger.cc: Auto merged
Diffstat (limited to 'mysql-test/r/trigger.result')
-rw-r--r--mysql-test/r/trigger.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/trigger.result b/mysql-test/r/trigger.result
index 4fa7a9ca8bd..f3e797d2344 100644
--- a/mysql-test/r/trigger.result
+++ b/mysql-test/r/trigger.result
@@ -295,7 +295,7 @@ create trigger trg before insert on t1 for each row set @a:=1;
create trigger trg after insert on t1 for each row set @a:=1;
ERROR HY000: Trigger already exists
create trigger trg2 before insert on t1 for each row set @a:=1;
-ERROR HY000: Trigger already exists
+ERROR 42000: This version of MySQL doesn't yet support 'multiple triggers with the same action time and event for one table'
create trigger trg before insert on t3 for each row set @a:=1;
ERROR HY000: Trigger already exists
create trigger trg2 before insert on t3 for each row set @a:=1;