mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into mysql.com:/home/psergey/mysql-5.0-merge
This commit is contained in:
unknown 2005-09-10 15:33:16 +04:00
commit 0fd4d20c53
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sql/sql_select.cc
View file

@ -8041,7 +8041,7 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
bool table_cant_handle_bit_fields, bool table_cant_handle_bit_fields,
uint convert_blob_length) uint convert_blob_length)
{ {
Item::Type orig_type; Item::Type orig_type= type;
Item *orig_item; Item *orig_item;
if (type != Item::FIELD_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; orig_item= item;
item= item->real_item(); item= item->real_item();
orig_type= type;
type= Item::FIELD_ITEM; type= Item::FIELD_ITEM;
} }
switch (type) { switch (type) {