diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-02-16 09:02:02 -0700 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-02-16 09:02:02 -0700 |
| commit | a858d8e84afe238789092a0d4d585ec5243f9fed (patch) | |
| tree | 3a04d97790571390b5233a060198c29b27273c1a /sql/sql_lex.h | |
| parent | 9d66be72b0ee079cecc39e09d4f4c0f7e1849dbc (diff) | |
| parent | a475ed7c6b6607272afb87517ae6ab1f3a397f41 (diff) | |
| download | mariadb-git-a858d8e84afe238789092a0d4d585ec5243f9fed.tar.gz | |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base
into weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index ae2b0d30a9c..5c16c4d06b2 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -884,10 +884,8 @@ struct st_parsing_options bool allows_select_procedure; bool allows_derived; - st_parsing_options() - : allows_variable(TRUE), allows_select_into(TRUE), - allows_select_procedure(TRUE), allows_derived(TRUE) - {} + st_parsing_options() { reset(); } + void reset(); }; |