mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for bug #10886 merge

Browse source
This commit is contained in:
evgen@moonbone.local 2005-06-22 21:07:28 +04:00
commit 473d7d59a7
3 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mysql-test/r/insert_select.result
View file

@ -625,3 +625,12 @@ select SQL_BUFFER_RESULT * from t1 WHERE (SEQ = 1);
ID NO SEQ ID NO SEQ
1 1 1 1 1 1
drop table t1; drop table t1;
create table t1 (f1 int);
create table t2 (ff1 int unique, ff2 int default 1);
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;
ff1 ff2
1 2
2 1
drop table t1, t2;

9
mysql-test/t/insert_select.test
View file

@ -164,3 +164,12 @@ INSERT INTO t1 (SEQ, NO) SELECT "1" AS SEQ, IF(MAX(NO) IS NULL, 0, MAX(NO)) + 1
select SQL_BUFFER_RESULT * from t1 WHERE (SEQ = 1); select SQL_BUFFER_RESULT * from t1 WHERE (SEQ = 1);
drop table t1; drop table t1;
#
# Bug#10886 - Have to restore default values after update ON DUPLICATE KEY
#
create table t1 (f1 int);
create table t2 (ff1 int unique, ff2 int default 1);
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;

5
sql/sql_insert.cc
View file

@ -2119,9 +2119,12 @@ bool select_insert::send_data(List<Item> &values)
} }
if (!(error= write_record(thd, table, &info))) if (!(error= write_record(thd, table, &info)))
{ {
if (table->triggers) if (table->triggers || info.handle_duplicates == DUP_UPDATE)
{ {
/* /*
Restore fields of the record since it is possible that they were
changed by ON DUPLICATE KEY UPDATE clause.
If triggers exist then whey can modify some fields which were not If triggers exist then whey can modify some fields which were not
originally touched by INSERT ... SELECT, so we have to restore originally touched by INSERT ... SELECT, so we have to restore
their original values for the next row. their original values for the next row.