diff options
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index b24744571e6..53304d736d8 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -38,6 +38,11 @@ static int lex_one_token(void *arg, void *yythd); sys_var *trg_new_row_fake_var= (sys_var*) 0x01; /** + LEX_STRING constant for null-string to be used in parser and other places. +*/ +const LEX_STRING null_lex_str= {NULL, 0}; +const LEX_STRING empty_lex_str= {(char *) "", 0}; +/** @note The order of the elements of this array must correspond to the order of elements in enum_binlog_stmt_unsafe. */ @@ -458,7 +463,7 @@ void lex_start(THD *thd) lex->select_lex.group_list.empty(); lex->describe= 0; lex->subqueries= FALSE; - lex->view_prepare_mode= FALSE; + lex->context_analysis_only= 0; lex->derived_tables= 0; lex->safe_to_cache_query= 1; lex->leaf_tables_insert= 0; @@ -493,7 +498,6 @@ void lex_start(THD *thd) lex->nest_level=0 ; lex->allow_sum_func= 0; lex->in_sum_func= NULL; - lex->protect_against_global_read_lock= FALSE; /* ok, there must be a better solution for this, long-term I tried "bzero" in the sql_yacc.yy code, but that for |