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

2 files changed, 2 insertions, 2 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;
diff --git a/mysql-test/t/trigger.test b/mysql-test/t/trigger.test
index 6c9b5063f32..91b418e7ca6 100644
--- a/mysql-test/t/trigger.test
+++ b/mysql-test/t/trigger.test
@@ -321,7 +321,7 @@ create trigger trg before insert on t2 for each row set @a:=1;
 create trigger trg before insert on t1 for each row set @a:=1;
 --error 1359
 create trigger trg after insert on t1 for each row set @a:=1;
---error 1359
+--error 1235
 create trigger trg2 before insert on t1 for each row set @a:=1;
 --error 1359
 create trigger trg before insert on t3 for each row set @a:=1;