1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt

Browse Source 
into  linux-st28.site:/home/martin/mysql/src/bug32848/my50-bug32848
This commit is contained in:
mhansson/martin@linux-st28.site 2007-12-20 11:24:42 +01:00
commit 284d8c71ee
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_select.cc
View File

@ -9041,7 +9041,7 @@ static Field *create_tmp_field_from_item(THD *thd, Item *item, TABLE *table,
*((*copy_func)++) = item; // Save for copy_funcs *((*copy_func)++) = item; // Save for copy_funcs
if (modify_item) if (modify_item)
item->set_result_field(new_field); item->set_result_field(new_field);
if (item->type() == MYSQL_TYPE_NULL) if (item->type() == Item::NULL_ITEM)
new_field->is_created_from_null_item= TRUE; new_field->is_created_from_null_item= TRUE;
return new_field; return new_field;
} }