diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-05-14 13:33:02 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-05-14 13:33:02 +0300 |
| commit | a6b3433b1f8b8008692106c01fa705ab4848a296 (patch) | |
| tree | 073417895d29c0f914a61109875c76ce21b4369c /sql/sql_lex.h | |
| parent | 1d51406e298ed7e3f6ddb5e239088a03774418ef (diff) | |
| parent | 213392db2da0a1ba289429524e7d154ecae779af (diff) | |
| download | mariadb-git-a6b3433b1f8b8008692106c01fa705ab4848a296.tar.gz | |
Merge
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/union.result:
Auto merged
sql/item.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
SCCS merged
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index aa3e81fd9c9..6e1e9fdecad 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -339,6 +339,7 @@ public: st_select_lex *fake_select_lex; st_select_lex *union_distinct; /* pointer to the last UNION DISTINCT */ + bool describe; /* union exec() called for EXPLAIN */ void init_query(); bool create_total_list(THD *thd, st_lex *lex, TABLE_LIST **result); @@ -423,7 +424,7 @@ public: ulong table_join_options; uint in_sum_expr; - uint select_number; /* number of select (used for EXPLAIN) */ + int select_number; /* number of select (used for EXPLAIN) */ uint with_wild; /* item list contain '*' */ bool braces; /* SELECT ... UNION (SELECT ... ) <- this braces */ /* TRUE when having fix field called in processing of this SELECT */ |