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

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse source 
into moonbone.local:/work/13392-bug-4.1-mysql
This commit is contained in:
unknown 2005-10-25 20:04:44 +04:00
commit d58f2bdfd7
3 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -678,3 +678,11 @@ f1
2001 2001
2002 2002
drop table t1; drop table t1;
create table t1(x int, y int);
create table t2(x int, z int);
insert into t1(x,y) select x,z from t2 on duplicate key update x=values(x);
insert into t1(x,y) select x,z from t2 on duplicate key update x=values(z);
ERROR 42S22: Unknown column 'z' in 'field list'
insert into t1(x,y) select x,z from t2 on duplicate key update x=values(t2.x);
ERROR 42S02: Unknown table 't2' in field list
drop table t1,t2;

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

@ -214,4 +214,16 @@ insert into t1(f1) select if(max(f1) is null, '2000',max(f1)+1) from t1;
select * from t1; select * from t1;
drop table t1; drop table t1;
#
# Bug #13392 values() fails with 'ambiguous' or returns NULL
# with ON DUPLICATE and SELECT
create table t1(x int, y int);
create table t2(x int, z int);
insert into t1(x,y) select x,z from t2 on duplicate key update x=values(x);
--error 1054
insert into t1(x,y) select x,z from t2 on duplicate key update x=values(z);
--error 1109
insert into t1(x,y) select x,z from t2 on duplicate key update x=values(t2.x);
drop table t1,t2;
# End of 4.1 tests # End of 4.1 tests

7
sql/item.cc
View file

@ -2796,8 +2796,14 @@ bool Item_insert_value::fix_fields(THD *thd,
Item **items) Item **items)
{ {
DBUG_ASSERT(fixed == 0); DBUG_ASSERT(fixed == 0);
st_table_list *orig_next_table= table_list->next;
table_list->next= 0;
if (!arg->fixed && arg->fix_fields(thd, table_list, &arg)) if (!arg->fixed && arg->fix_fields(thd, table_list, &arg))
{
table_list->next= orig_next_table;
return 1; return 1;
}
table_list->next= orig_next_table;
if (arg->type() == REF_ITEM) if (arg->type() == REF_ITEM)
{ {
@ -2809,6 +2815,7 @@ bool Item_insert_value::fix_fields(THD *thd,
arg= ref->ref[0]; arg= ref->ref[0];
} }
Item_field *field_arg= (Item_field *)arg; Item_field *field_arg= (Item_field *)arg;
if (field_arg->field->table->insert_values) if (field_arg->field->table->insert_values)
{ {
Field *def_field= (Field*) sql_alloc(field_arg->field->size_of()); Field *def_field= (Field*) sql_alloc(field_arg->field->size_of());