Commit 0fd4d20c authored by unknown's avatar unknown

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

into mysql.com:/home/psergey/mysql-5.0-merge

parents b5622d49 f4ca9acd
......@@ -8041,7 +8041,7 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
bool table_cant_handle_bit_fields,
uint convert_blob_length)
{
Item::Type orig_type;
Item::Type orig_type= type;
Item *orig_item;
if (type != Item::FIELD_ITEM &&
......@@ -8051,7 +8051,6 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
{
orig_item= item;
item= item->real_item();
orig_type= type;
type= Item::FIELD_ITEM;
}
switch (type) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment