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 bk-internal:/home/bk/mysql-5.0-opt

Browse source 
into  macbook.gmz:/Users/kgeorge/mysql/work/B22344-5.0-opt
This commit is contained in:
gkodinov/kgeorge@macbook.gmz 2007-02-09 11:07:35 +02:00
commit a119169bf0
1 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sql/item.cc
View file

@ -5277,18 +5277,7 @@ my_decimal *Item_ref::val_decimal(my_decimal *decimal_value)
int Item_ref::save_in_field(Field *to, bool no_conversions)
{
int res;
if (result_field)
{
if (result_field->is_null())
{
null_value= 1;
return set_field_to_null_with_conversions(to, no_conversions);
}
to->set_notnull();
res= field_conv(to, result_field);
null_value= 0;
return res;
}
DBUG_ASSERT(!result_field);
res= (*ref)->save_in_field(to, no_conversions);
null_value= (*ref)->null_value;
return res;