diff options
| author | unknown <bell@sanja.is.com.ua> | 2002-09-03 10:06:10 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2002-09-03 10:06:10 +0300 |
| commit | 9dea4a4cd1ac246004dc9d223cfc606a7dea5567 (patch) | |
| tree | 47d958e5060fcfc773f2874d7abccdd221a738cf /sql/sql_select.h | |
| parent | 3a9dabd6765e7dad0cbd6949ac275487f72696d2 (diff) | |
| parent | 3fbcafea9c5e85dc6315f0b89872ac5e273195c8 (diff) | |
| download | mariadb-git-9dea4a4cd1ac246004dc9d223cfc606a7dea5567.tar.gz | |
merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index f651f069c13..495dd7f7ab7 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -209,6 +209,7 @@ class JOIN :public Sql_alloc{ send_records(0), found_records(0), examined_rows(0), thd(thd), sum_funcs(0), + procedure(0), having(0), select_options(select_options), result(result), @@ -235,7 +236,8 @@ class JOIN :public Sql_alloc{ int prepare(TABLE_LIST *tables, COND *conds, ORDER *order, ORDER *group, Item *having, - ORDER *proc_param, SELECT_LEX *select, SELECT_LEX_UNIT *unit); + ORDER *proc_param, SELECT_LEX *select, SELECT_LEX_UNIT *unit, + bool fake_select_lex); int optimize(); int global_optimize(); int reinit(); |