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

merging

Browse Source 
sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown
2003-06-19 16:15:11 +03:00
parent 9b83d3e536 a33adc45bc
commit 3f7e8b2146
3 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_select.cc
View File

@@ -7230,9 +7230,11 @@ find_order_in_list(THD *thd, Item **ref_pointer_array,
}
order->in_field_list=0;
Item *it= *order->item;
if (it->fix_fields(thd, tables, order->item) || it->check_cols(1) ||
if (it->fix_fields(thd, tables, order->item) ||
//'it' ressigned because fix_field can change it
(it= *order->item), it->check_cols(1) ||
thd->is_fatal_error)
return 1; // Wrong field
return 1; // Wrong field
uint el= all_fields.elements;
all_fields.push_front(it); // Add new field to field list
ref_pointer_array[el]= it;