diff options
| author | unknown <antony@ltantony.mysql.com> | 2005-05-07 16:50:22 +0100 |
|---|---|---|
| committer | unknown <antony@ltantony.mysql.com> | 2005-05-07 16:50:22 +0100 |
| commit | 4989274681efb233f284d919c67836faa0b5905f (patch) | |
| tree | 412584e06dd49bb852f5da22c2313c5661c4530a /mysql-test/r/insert_update.result | |
| parent | 6d89aa730e6c9d507a0de2b1a0e088f174b89f22 (diff) | |
| parent | 0de8a53ff223bee81fa8bd17adecf2be8767fa26 (diff) | |
| download | mariadb-git-4989274681efb233f284d919c67836faa0b5905f.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
mysql-test/r/create.result:
Auto merged
mysql-test/r/insert_update.result:
Auto merged
mysql-test/t/create.test:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_yacc.yy:
SCCS merged
Diffstat (limited to 'mysql-test/r/insert_update.result')
| -rw-r--r-- | mysql-test/r/insert_update.result | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/r/insert_update.result b/mysql-test/r/insert_update.result index 1817500973e..12b83640d91 100644 --- a/mysql-test/r/insert_update.result +++ b/mysql-test/r/insert_update.result @@ -167,3 +167,16 @@ a b c VALUES(a) 2 1 11 NULL DROP TABLE t1; DROP TABLE t2; +create table t1 (a int not null unique); +insert into t1 values (1),(2); +insert ignore into t1 select 1 on duplicate key update a=2; +select * from t1; +a +1 +2 +insert ignore into t1 select a from t1 on duplicate key update a=a+1 ; +select * from t1; +a +1 +3 +drop table t1; |