diff options
| author | unknown <bell@sanja.is.com.ua> | 2002-09-03 09:50:36 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2002-09-03 09:50:36 +0300 |
| commit | 3fbcafea9c5e85dc6315f0b89872ac5e273195c8 (patch) | |
| tree | 80af274b045962ab1f5805301ffc1dfa15a21b96 /sql/sql_select.h | |
| parent | 1648e47889f6c981847ab300bf6e71d08c9f0667 (diff) | |
| download | mariadb-git-3fbcafea9c5e85dc6315f0b89872ac5e273195c8.tar.gz | |
subselect with union
new error handling
Item_ref bug fixed
include/mysql_com.h:
new error handling
query cache pointer description
mysql-test/r/distinct.result:
new result's after Monty's bug fixing
mysql-test/r/subselect.result:
subselect with union test
mysql-test/t/subselect.test:
subselect with union test
sql/item.cc:
subselect with union
Item_ref bug fixed
sql/item_cmpfunc.cc:
Monty's bug fixing
sql/item_subselect.cc:
TODO changing
subselect with union
sql/item_subselect.h:
subselect with union
sql/mysql_priv.h:
Item_ref bug fixed
sql/mysqld.cc:
new error handling
sql/net_pkg.cc:
new error handling
sql/net_serv.cc:
new error handling
sql/sql_base.cc:
Item_ref bug fixed
sql/sql_class.cc:
new error handling
sql/sql_class.h:
new error handling
sql/sql_derived.cc:
subselect with union
sql/sql_insert.cc:
new error handling (only with mysql_select now)
sql/sql_lex.cc:
subselect with union
sql/sql_lex.h:
subselect with union
sql/sql_parse.cc:
new error handling
sql/sql_select.cc:
new error handling
subselect with union
removed thd->where=0 hack
sql/sql_select.h:
subselect with union
sql/sql_union.cc:
subselect with union
sql/sql_update.cc:
new error handling (only with mysql_select now)
sql/sql_yacc.yy:
subselect with union
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 3062747a08f..0f7e08d268e 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(); |