diff options
| author | unknown <igor@olga.mysql.com> | 2007-02-13 01:34:36 -0800 |
|---|---|---|
| committer | unknown <igor@olga.mysql.com> | 2007-02-13 01:34:36 -0800 |
| commit | 21df932dbdd63e2c0128334f761f23577c74b45c (patch) | |
| tree | 0ebadd1cbf0ccf30ae7b01d82842db102e6a9fb3 /mysql-test/r/insert_select.result | |
| parent | 9292b57707fb0a2ccd6fb07a777a0f2089f8f6c5 (diff) | |
| parent | 4c2bc81ae762072973528e306c8fa80031b076b2 (diff) | |
| download | mariadb-git-21df932dbdd63e2c0128334f761f23577c74b45c.tar.gz | |
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into olga.mysql.com:/home/igor/mysql-5.1-opt
BitKeeper/etc/gone:
auto-union
mysql-test/r/insert_select.result:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/insert_select.test:
Auto merged
mysql-test/t/join_outer.test:
Auto merged
mysql-test/t/select.test:
Auto merged
mysys/my_getopt.c:
Auto merged
sql/field.h:
Auto merged
sql/field_conv.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
mysql-test/include/mix1.inc:
Manual merge
mysql-test/r/information_schema.result:
Manual merge
mysql-test/r/innodb_mysql.result:
Manual merge
mysql-test/t/information_schema.test:
Manual merge
mysql-test/t/view.test:
Manual merge
mysys/my_pthread.c:
Manual merge
sql/mysql_priv.h:
Manual merge
sql/opt_range.cc:
Manual merge
sql/sql_insert.cc:
Manual merge
sql/sql_update.cc:
Manual merge
Diffstat (limited to 'mysql-test/r/insert_select.result')
| -rw-r--r-- | mysql-test/r/insert_select.result | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/mysql-test/r/insert_select.result b/mysql-test/r/insert_select.result index b6c02869914..830c25932af 100644 --- a/mysql-test/r/insert_select.result +++ b/mysql-test/r/insert_select.result @@ -705,3 +705,29 @@ use bug21774_1; INSERT INTO bug21774_2.t1 SELECT t1.* FROM t1; DROP DATABASE bug21774_1; DROP DATABASE bug21774_2; +USE test; +create table t1(f1 int primary key, f2 int); +insert into t1 values (1,1); +affected rows: 1 +insert into t1 values (1,1) on duplicate key update f2=1; +affected rows: 0 +insert into t1 values (1,1) on duplicate key update f2=2; +affected rows: 2 +select * from t1; +f1 f2 +1 2 +drop table t1; +create table t1(f1 int primary key auto_increment, f2 int unique); +insert into t1(f2) values(1); +select @@identity; +@@identity +1 +insert ignore t1(f2) values(1); +select @@identity; +@@identity +0 +insert ignore t1(f2) select 1; +select @@identity; +@@identity +0 +drop table t1; |