diff options
| author | unknown <bell@sanja.is.com.ua> | 2002-10-04 14:15:59 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2002-10-04 14:15:59 +0300 |
| commit | 05c5908a9e801d604a5651ccb9fde081378435f9 (patch) | |
| tree | c7e9f63a5d35171d649cbd11f951d58a8f953720 /sql/sql_select.h | |
| parent | e607221a3cd778131cc9250108473819c9b8c8a0 (diff) | |
| parent | f094b6af4c5c32bfda7f74461d47675ab61722a0 (diff) | |
| download | mariadb-git-05c5908a9e801d604a5651ccb9fde081378435f9.tar.gz | |
merging
include/mysql_com.h:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/distinct.result:
Auto merged
mysql-test/r/group_by.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/key_primary.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/r/odbc.result:
Auto merged
mysql-test/r/order_by.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/r/user_var.result:
Auto merged
mysql-test/r/varbinary.result:
Auto merged
mysql-test/t/union.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_update.cc:
Auto merged
sql/table.h:
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 89dee2a4019..7aa2e5da48a 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -210,6 +210,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), @@ -237,7 +238,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(); |