diff options
| author | acurtis@pcgem.rdg.cyberkinetica.com <> | 2005-02-17 17:38:13 +0000 |
|---|---|---|
| committer | acurtis@pcgem.rdg.cyberkinetica.com <> | 2005-02-17 17:38:13 +0000 |
| commit | 647eaaea1db935c797d7361a9e03ef9490e2a19f (patch) | |
| tree | 579a318fe196e3b6694931b75c907f2a26fabe53 /mysql-test/r/insert_update.result | |
| parent | a5e6d39919ec11bb69e44aba1c450236fc718766 (diff) | |
| parent | a1bf1c926eeb3172b47019d6408cb053879b9364 (diff) | |
| download | mariadb-git-647eaaea1db935c797d7361a9e03ef9490e2a19f.tar.gz | |
Bug#8147
Merge from 4.1
Diffstat (limited to 'mysql-test/r/insert_update.result')
| -rw-r--r-- | mysql-test/r/insert_update.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/insert_update.result b/mysql-test/r/insert_update.result index 7027d7eff79..1817500973e 100644 --- a/mysql-test/r/insert_update.result +++ b/mysql-test/r/insert_update.result @@ -140,10 +140,10 @@ a b c 5 6 130 TRUNCATE TABLE t1; INSERT t1 VALUES (1,2,10), (3,4,20); -CREATE TABLE t2 (x INT, y INT, z INT, d INT); +CREATE TABLE t2 (a INT, b INT, c INT, d INT); INSERT t2 VALUES (5,6,30,1), (7,4,40,1), (8,9,60,1); INSERT t2 VALUES (2,1,11,2), (7,4,40,2); -INSERT t1 SELECT x,y,z FROM t2 WHERE d=1 ON DUPLICATE KEY UPDATE c=c+100; +INSERT t1 SELECT a,b,c FROM t2 WHERE d=1 ON DUPLICATE KEY UPDATE c=c+100; SELECT * FROM t1; a b c 1 2 10 @@ -157,7 +157,7 @@ a b c 3 4 120 5 0 30 8 9 60 -INSERT t1 SELECT x,y,z FROM t2 WHERE d=2 ON DUPLICATE KEY UPDATE c=c+VALUES(a); +INSERT t1 SELECT a,b,c FROM t2 WHERE d=2 ON DUPLICATE KEY UPDATE c=c+VALUES(a); SELECT *, VALUES(a) FROM t1; a b c VALUES(a) 1 2 10 NULL |