diff options
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index eb9b8fe5c6e..d5afa0a89dd 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -4866,7 +4866,7 @@ public: class select_unit :public select_result_interceptor { uint curr_step, prev_step, curr_sel; - enum step_type {union_step, intersect_step, except_step} step; + enum sub_select_type step; public: Item_int *intersect_mark; TMP_TABLE_PARAM tmp_table_param; @@ -4877,7 +4877,7 @@ public: select_unit(THD *thd_arg): select_result_interceptor(thd_arg), curr_step(0), prev_step(0), curr_sel(UINT_MAX), - step(union_step), intersect_mark(0), write_err(0), table(0), + step(UNION_TYPE), intersect_mark(0), write_err(0), table(0), records(0) { tmp_table_param.init(); } int prepare(List<Item> &list, SELECT_LEX_UNIT *u); @@ -4903,6 +4903,7 @@ public: bool keep_row_order, uint hidden); TMP_TABLE_PARAM *get_tmp_table_param() { return &tmp_table_param; } + void change_select(); }; class select_union_recursive :public select_unit |