database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-5.0

Browse Source 
into  frost.snake.net:/private/tmp/merge-5.1


sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown
2005-09-10 19:30:02 -05:00
parent 72ad93a076 e85f42c5e6
commit bf0562f20d
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_select.cc
View File

@ -8056,7 +8056,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 &&
@ -8066,7 +8066,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) {