diff options
| author | unknown <sanja@montyprogram.com> | 2013-10-29 22:20:45 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2013-10-29 22:20:45 +0200 |
| commit | 97ecffc8ee11863bfb3075041b85a571eafa494f (patch) | |
| tree | 1943b382cfb10d77c564c1bdb1d02b12adb88668 /sql/sql_select.h | |
| parent | 0fdb3bcfdbfa5d7cad28adc1c0f7c0958cdab2e0 (diff) | |
| parent | f4d5d849fd3b526d38ca6eb083fd0b290eb0eda7 (diff) | |
| download | mariadb-git-97ecffc8ee11863bfb3075041b85a571eafa494f.tar.gz | |
merge 10.0-base -> 10.0
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index c335836e19b..c413d0ca023 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -1351,8 +1351,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(); |