Commit 22d1a50d authored by tnurnberg@white.intern.koehntopp.de's avatar tnurnberg@white.intern.koehntopp.de
Browse files

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt

into  mysql.com:/misc/mysql/31990/50-31990
parents d1637b2e 284d8c71
Loading
Loading
Loading
Loading
+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;
}