mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 15:15:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge from mysql-5.1 to mysql-5.5

Browse source
This commit is contained in:
Annamalai Gurusami 2013-02-22 15:15:14 +05:30
commit 64c5c5cbfc
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
sql/set_var.h
View file

@ -225,13 +225,23 @@ public:
if (value_arg && value_arg->type() == Item::FIELD_ITEM)
{
Item_field *item= (Item_field*) value_arg;
if (!(value=new Item_string(item->field_name,
(uint) strlen(item->field_name),
system_charset_info))) // names are utf8
value=value_arg; /* Give error message later */
if (item->field_name)
{
if (!(value= new Item_string(item->field_name,
(uint) strlen(item->field_name),
system_charset_info))) // names are utf8
value= value_arg; /* Give error message later */
}
else
{
/* Both Item_field and Item_insert_value will return the type as
Item::FIELD_ITEM. If the item->field_name is NULL, we assume the
object to be Item_insert_value. */
value= value_arg;
}
}
else
value=value_arg;
value= value_arg;
}
int check(THD *thd);
int update(THD *thd);