database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Manually merged

Browse Source
This commit is contained in:
evgen@moonbone.local
2006-01-24 22:10:39 +03:00
parent 8d0378f542 b1967ad723
commit baed6da5bc
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/update.result
View File

@@ -358,3 +358,7 @@ update t2,t1 set f1=3,f2=3 where f1=f2 and f1=1;
affected rows: 3 affected rows: 3
info: Rows matched: 3 Changed: 3 Warnings: 0 info: Rows matched: 3 Changed: 3 Warnings: 0
drop table t1,t2; drop table t1,t2;
create table t1(f1 int, `*f2` int);
insert into t1 values (1,1);
update t1 set `*f2`=1;
drop table t1;

8
mysql-test/t/update.test
View File

@@ -287,4 +287,12 @@ update t1 set f1=1 where f1=3;
update t2,t1 set f1=3,f2=3 where f1=f2 and f1=1; update t2,t1 set f1=3,f2=3 where f1=f2 and f1=1;
--disable_info --disable_info
drop table t1,t2; drop table t1,t2;
#
# Bug #16510 Updating field named like '*name' caused server crash
#
create table t1(f1 int, `*f2` int);
insert into t1 values (1,1);
update t1 set `*f2`=1;
drop table t1;
# End of 4.1 tests # End of 4.1 tests

1
sql/sql_base.cc
View File

@@ -2390,6 +2390,7 @@ int setup_wild(THD *thd, TABLE_LIST *tables, List<Item> &fields,
if (item->type() == Item::FIELD_ITEM && if (item->type() == Item::FIELD_ITEM &&
((Item_field*) item)->field_name && ((Item_field*) item)->field_name &&
((Item_field*) item)->field_name[0] == '*' && ((Item_field*) item)->field_name[0] == '*' &&
((Item_field*) item)->field_name[1] == 0 &&
!((Item_field*) item)->field) !((Item_field*) item)->field)
{ {
uint elem= fields.elements; uint elem= fields.elements;