database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4302
This commit is contained in:
dlenev@brandersnatch.localdomain
2004-08-20 19:30:45 +04:00
parent a71f1894d0 c8882165f3
commit b4105df897
4 changed files with 212 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_select.cc
View File

@@ -7994,13 +7994,18 @@ find_order_in_list(THD *thd, Item **ref_pointer_array,
return 0;
}
uint counter;
Item **item= find_item_in_list(itemptr, fields, &counter, IGNORE_ERRORS);
if (item)
Item **item= find_item_in_list(itemptr, fields, &counter,
REPORT_EXCEPT_NOT_FOUND);
if (!item)
return 1;
if (item != not_found_item)
{
order->item= ref_pointer_array + counter;
order->in_field_list=1;
return 0;
}
order->in_field_list=0;
Item *it= *order->item;
/*