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/t/insert_select.test | |
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/t/insert_select.test')
-rw-r--r-- | mysql-test/t/insert_select.test | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/t/insert_select.test b/mysql-test/t/insert_select.test index 834561ed5f7..a6468c52645 100644 --- a/mysql-test/t/insert_select.test +++ b/mysql-test/t/insert_select.test @@ -173,3 +173,17 @@ insert into t1 values (1),(1),(2); insert into t2(ff1) select f1 from t1 on duplicate key update ff2=ff2+1; select * from t2; drop table t1, t2; +# +# BUGS #9728 - 'Decreased functionality in "on duplicate key update"' +# #8147 - 'a column proclaimed ambigous in INSERT ... SELECT .. ON +# DUPLICATE' +# +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; +insert into t1 select t2.a from t2 on duplicate key update a= a + t2.b; +select * from t1; +drop table t1; +drop table t2; |