diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-05-06 01:42:33 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-05-06 01:42:33 +0300 |
| commit | 429c488fce60fb33210ed033e7643c51a247a452 (patch) | |
| tree | c8c48286264f246d1163d5b1bf09b192dd8775f4 /mysql-test | |
| parent | b96aaea7e15642a8f0d9a478e9daabe470cb966d (diff) | |
| parent | 79c53934bec3cb6504f8cf8b1c6d8d465b12a149 (diff) | |
| download | mariadb-git-429c488fce60fb33210ed033e7643c51a247a452.tar.gz | |
merge
sql/item.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/unireg.h:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/insert_update.result | 8 | ||||
| -rw-r--r-- | mysql-test/t/insert_update.test | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/insert_update.result b/mysql-test/r/insert_update.result index 8cc79564679..068f7c68286 100644 --- a/mysql-test/r/insert_update.result +++ b/mysql-test/r/insert_update.result @@ -48,4 +48,12 @@ a b c 3 4 120 5 0 30 8 9 60 +INSERT t1 VALUES (2,1,11), (7,4,40) ON DUPLICATE KEY UPDATE c=c+VALUES(a); +SELECT *, VALUES(a) FROM t1; +a b c VALUES(a) +1 2 10 NULL +3 4 127 NULL +5 0 30 NULL +8 9 60 NULL +2 1 11 NULL DROP TABLE t1; diff --git a/mysql-test/t/insert_update.test b/mysql-test/t/insert_update.test index f40391554cc..4f19aca8738 100644 --- a/mysql-test/t/insert_update.test +++ b/mysql-test/t/insert_update.test @@ -21,4 +21,6 @@ INSERT t1 VALUES (5,6,30), (7,4,40), (8,9,60) ON DUPLICATE KEY UPDATE c=c+100; SELECT * FROM t1; INSERT t1 SET a=5 ON DUPLICATE KEY UPDATE b=0; SELECT * FROM t1; +INSERT t1 VALUES (2,1,11), (7,4,40) ON DUPLICATE KEY UPDATE c=c+VALUES(a); +SELECT *, VALUES(a) FROM t1; DROP TABLE t1; |