diff options
| author | bell@sanja.is.com.ua <> | 2004-05-14 13:33:02 +0300 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2004-05-14 13:33:02 +0300 |
| commit | 71a374dc1384db2c5e48a059bcdd3624ddcc4564 (patch) | |
| tree | 073417895d29c0f914a61109875c76ce21b4369c /sql/sql_lex.h | |
| parent | a71771788e31f7b5c624bc1915bdd7f95ed257b6 (diff) | |
| parent | 8885ce0dd77f499a5672fb7f38278bdc9dcf3393 (diff) | |
| download | mariadb-git-71a374dc1384db2c5e48a059bcdd3624ddcc4564.tar.gz | |
Merge
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 */ |