diff options
author | unknown <sergefp@mysql.com> | 2006-11-01 00:54:49 +0300 |
---|---|---|
committer | unknown <sergefp@mysql.com> | 2006-11-01 00:54:49 +0300 |
commit | 361f0468dba471aa0355214653244c14b3dd18a5 (patch) | |
tree | 22b64fd9faf1fcc7f8c2a609864dd738be0ba251 /sql/sql_lex.h | |
parent | dcaa684cabf1bee3e243c646fe94fcf684bfe0b5 (diff) | |
parent | eb5abc14b310b63bd89495d4e2bd07ec28816944 (diff) | |
download | mariadb-git-361f0468dba471aa0355214653244c14b3dd18a5.tar.gz |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into mysql.com:/home/psergey/mysql-5.0-bug8804-r4
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r-- | sql/sql_lex.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index b23ccb4f3fc..1d6f344cb1c 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -470,7 +470,7 @@ public: void set_thd(THD *thd_arg) { thd= thd_arg; } friend void lex_start(THD *thd, uchar *buf, uint length); - friend int subselect_union_engine::exec(); + friend int subselect_union_engine::exec(bool); List<Item> *get_unit_column_types(); }; @@ -562,6 +562,8 @@ public: query processing end even if we use temporary table */ bool subquery_in_having; + /* TRUE <=> this SELECT is correlated w.r.t. some ancestor select */ + bool is_correlated; /* This variable is required to ensure proper work of subqueries and stored procedures. Generally, one should use the states of |