Commit 284d8c71 authored by mhansson/martin@linux-st28.site's avatar mhansson/martin@linux-st28.site
Browse files

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

into  linux-st28.site:/home/martin/mysql/src/bug32848/my50-bug32848
parents 0004b99b 6f6e1880

sql/sql_select.cc

+1 −1
Original line number Diff line number Diff line
@@ -9041,7 +9041,7 @@ static Field *create_tmp_field_from_item(THD *thd, Item *item, TABLE *table, 
    *((*copy_func)++) = item;			// Save for copy_funcs

  if (modify_item)

    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;

  return new_field;

}