mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Ramil Kalimullin 2008-09-05 12:48:56 +05:00
commit cdec56dc85
3 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
mysql-test/r/default.result
View file

@ -205,4 +205,19 @@ Warnings:
Warning 1364 Field 'id' doesn't have a default value Warning 1364 Field 'id' doesn't have a default value
drop view v1; drop view v1;
drop table t1; drop table t1;
create table t1 (a int unique);
create table t2 (b int default 10);
insert into t1 (a) values (1);
insert into t2 (b) values (1);
insert into t1 (a) select b from t2 on duplicate key update a=default;
select * from t1;
a
NULL
insert into t1 (a) values (1);
insert into t1 (a) select b from t2 on duplicate key update a=default(b);
select * from t1;
a
NULL
10
drop table t1, t2;
End of 5.0 tests. End of 5.0 tests.

19
mysql-test/t/default.test
View file

@ -145,5 +145,24 @@ insert into t1 values(default);
drop view v1; drop view v1;
drop table t1; drop table t1;
#
# Bug #39002: crash with
# INSERT ... SELECT ... ON DUPLICATE KEY UPDATE col=DEFAULT
#
create table t1 (a int unique);
create table t2 (b int default 10);
insert into t1 (a) values (1);
insert into t2 (b) values (1);
insert into t1 (a) select b from t2 on duplicate key update a=default;
select * from t1;
insert into t1 (a) values (1);
insert into t1 (a) select b from t2 on duplicate key update a=default(b);
select * from t1;
drop table t1, t2;
--echo End of 5.0 tests. --echo End of 5.0 tests.

7
sql/item.cc
View file

@ -6046,6 +6046,13 @@ Item *Item_default_value::transform(Item_transformer transformer, byte *args)
{ {
DBUG_ASSERT(!current_thd->is_stmt_prepare()); DBUG_ASSERT(!current_thd->is_stmt_prepare());
/*
If the value of arg is NULL, then this object represents a constant,
so further transformation is unnecessary (and impossible).
*/
if (!arg)
return 0;
Item *new_item= arg->transform(transformer, args); Item *new_item= arg->transform(transformer, args);
if (!new_item) if (!new_item)
return 0; return 0;