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

merge 5.5->10.0-base

Browse Source
This commit is contained in:
unknown
2013-10-29 20:53:05 +02:00
parent fef4166990 52dea41052
commit f4d5d849fd
29 changed files with 270 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_select.h
View File

@ -1360,8 +1360,8 @@ public:
bool exec_saved_explain;
int prepare(Item ***rref_pointer_array, TABLE_LIST *tables, uint wind_num,
COND *conds, uint og_num, ORDER *order, ORDER *group,
Item *having, ORDER *proc_param, SELECT_LEX *select,
COND *conds, uint og_num, ORDER *order, bool skip_order_by,
ORDER *group, Item *having, ORDER *proc_param, SELECT_LEX *select,
SELECT_LEX_UNIT *unit);
bool prepare_stage2();
int optimize();