database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge bk-internal:/home/bk/mysql-5.0-opt

Browse Source 
into  macbook.gmz:/Users/kgeorge/mysql/work/B21798-5.0-opt-merge
This commit is contained in:
gkodinov/kgeorge@macbook.gmz
2006-10-17 16:36:44 +03:00
parent 52dacf7c9a f7b8937661
commit a64ae1844d
8 changed files with 104 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/mysql_priv.h
View File

@ -714,7 +714,8 @@ bool mysql_xa_recover(THD *thd);
bool check_simple_select();
SORT_FIELD * make_unireg_sortorder(ORDER *order, uint *length);
SORT_FIELD * make_unireg_sortorder(ORDER *order, uint *length,
SORT_FIELD *sortorder);
int setup_order(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables,
List<Item> &fields, List <Item> &all_fields, ORDER *order);
int setup_group(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables,