diff options
| author | unknown <kroki@mysql.com> | 2006-06-28 23:54:18 +0400 |
|---|---|---|
| committer | unknown <kroki@mysql.com> | 2006-06-28 23:54:18 +0400 |
| commit | 48d1dc7417bbe26cbc3733aa401b06b88d524604 (patch) | |
| tree | ac329416869abcbf9c30af5b173b13cc6bda51d8 /mysql-test/t/trigger.test | |
| parent | 88843709d8d2bb07794f3c13084bf33e5dea8662 (diff) | |
| parent | 837c9719c436faa083872fda118891c94bbc3403 (diff) | |
| download | mariadb-git-48d1dc7417bbe26cbc3733aa401b06b88d524604.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/t/trigger.test')
| -rw-r--r-- | mysql-test/t/trigger.test | 2 |
1 files changed, 1 insertions, 1 deletions
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; |