diff options
| author | unknown <monty@mishka.local> | 2004-09-09 15:58:55 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2004-09-09 15:58:55 +0300 |
| commit | b15004a800770c3bdfc85f69c86629573669e1d0 (patch) | |
| tree | 368687b45835bc7b5a71ef90de23cb752f4a1865 /sql/item_subselect.h | |
| parent | ac473c38136ea8fed453e316b052819cd86d08a8 (diff) | |
| parent | bc787254247cb66a5e1adc0af6834c10737ecc6e (diff) | |
| download | mariadb-git-b15004a800770c3bdfc85f69c86629573669e1d0.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.local:/home/my/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
Diffstat (limited to 'sql/item_subselect.h')
| -rw-r--r-- | sql/item_subselect.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_subselect.h b/sql/item_subselect.h index e5defe24756..ed3dbfa9855 100644 --- a/sql/item_subselect.h +++ b/sql/item_subselect.h @@ -36,8 +36,6 @@ class Item_subselect :public Item_result_field protected: /* thread handler, will be assigned in fix_fields only */ THD *thd; - /* Item_arena used or 0 */ - Item_arena *arena; /* substitution instead of subselect in case of optimization */ Item *substitution; /* unit of subquery */ @@ -50,6 +48,8 @@ protected: table_map used_tables_cache; /* allowed number of columns (1 for single value subqueries) */ uint max_columns; + /* where subquery is placed */ + enum_parsing_place parsing_place; /* work with 'substitution' */ bool have_to_be_excluded; /* cache of constant state */ |