diff options
| author | unknown <evgen@moonbone.local> | 2007-03-20 01:29:09 +0300 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2007-03-20 01:29:09 +0300 |
| commit | ca16e7038cf12bc70a995decbb6e347337139bb8 (patch) | |
| tree | ece1e13959d1fc43f206693dd5f3c68ab334ccd5 /mysql-test/r/trigger.result | |
| parent | 84d24679b955ede6ad0194100355fe4b9139301a (diff) | |
| parent | 3798a7d5008f8f569f779f096b7fc1e1cfac1031 (diff) | |
| download | mariadb-git-ca16e7038cf12bc70a995decbb6e347337139bb8.tar.gz | |
Merge moonbone.local:/mnt/gentoo64/work/27006-bug-5.0-opt-mysql
into moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
mysql-test/r/trigger.result:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/sql_insert.cc:
Manually merged.
Diffstat (limited to 'mysql-test/r/trigger.result')
| -rw-r--r-- | mysql-test/r/trigger.result | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mysql-test/r/trigger.result b/mysql-test/r/trigger.result index edd083f73aa..c24f7b6b06f 100644 --- a/mysql-test/r/trigger.result +++ b/mysql-test/r/trigger.result @@ -1398,18 +1398,19 @@ id val 1 test1 2 test2 INSERT INTO t1 VALUES (2,'test2') ON DUPLICATE KEY UPDATE val=VALUES(val); -INSERT INTO t1 VALUES (3,'test3') ON DUPLICATE KEY UPDATE val=VALUES(val); +INSERT INTO t1 VALUES (2,'test3') ON DUPLICATE KEY UPDATE val=VALUES(val); +INSERT INTO t1 VALUES (3,'test4') ON DUPLICATE KEY UPDATE val=VALUES(val); SELECT * FROM t1; id val 1 test1 -2 test2 -3 test3 +2 test3 +3 test4 SELECT * FROM t2; id val 1 test1 2 test2 -3 test2 -4 test3 +3 test3 +4 test4 DROP TRIGGER trg27006_a_insert; DROP TRIGGER trg27006_a_update; drop table t1,t2; |