diff options
| author | unknown <evgen@moonbone.local> | 2005-06-23 01:02:43 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2005-06-23 01:02:43 +0400 |
| commit | f3a3e052491f7e1ac1d759cb1498a28863dc51ee (patch) | |
| tree | 2eb5c9308d86de24da712c95e1f909985b459694 /mysql-test/r/insert_select.result | |
| parent | bbc0211304fe7beb47fef9f188e413effeea4470 (diff) | |
| parent | 285e348c1fc1705aa54023685a62b6689ba74c29 (diff) | |
| download | mariadb-git-f3a3e052491f7e1ac1d759cb1498a28863dc51ee.tar.gz | |
Bug #9728 fix merge
mysql-test/r/insert_select.result:
Auto merged
mysql-test/t/insert_select.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/sql_base.cc:
Manual merge
sql/sql_parse.cc:
Manual merge
sql/sql_yacc.yy:
Manual merge
Diffstat (limited to 'mysql-test/r/insert_select.result')
| -rw-r--r-- | mysql-test/r/insert_select.result | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/r/insert_select.result b/mysql-test/r/insert_select.result index 11384b0feff..026dae8381a 100644 --- a/mysql-test/r/insert_select.result +++ b/mysql-test/r/insert_select.result @@ -634,3 +634,18 @@ ff1 ff2 1 2 2 1 drop table t1, t2; +create table t1 (a int unique); +create table t2 (a int, b int); +insert into t1 values (1),(2); +insert into t2 values (1,2); +select * from t1; +a +1 +2 +insert into t1 select t2.a from t2 on duplicate key update a= a + t2.b; +select * from t1; +a +2 +3 +drop table t1; +drop table t2; |