diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-05-22 09:52:22 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-05-22 09:52:22 +0300 |
| commit | 716d6c47ac7c0027a0f45a7981e1841686fd43f9 (patch) | |
| tree | 3dfea9a33ae593d529e5f367c4ac7ff05f7ea1f1 /sql/sql_lex.h | |
| parent | 4637832fa19b2866929c1e5cb7c9dd0a40db15c9 (diff) | |
| parent | 4868c1632cf902bae767123213d76dd53a78e2c6 (diff) | |
| download | mariadb-git-716d6c47ac7c0027a0f45a7981e1841686fd43f9.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-top-4.1
mysql-test/r/subselect.result:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
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 f31b3305e07..524ce4284e6 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -352,6 +352,8 @@ public: bool braces; /* SELECT ... UNION (SELECT ... ) <- this braces */ /* TRUE when having fix field called in processing of this SELECT */ bool having_fix_field; + /* TRUE for fake select, which used in UNION processing */ + bool fake_select; void init_query(); void init_select(); @@ -405,7 +407,7 @@ public: friend void mysql_init_query(THD *thd); st_select_lex(struct st_lex *lex); - st_select_lex() {} + st_select_lex() :fake_select(0) {} void make_empty_select(st_select_lex *last_select) { select_number=INT_MAX; |