diff options
author | pem@mysql.com <> | 2003-02-18 15:05:35 +0100 |
---|---|---|
committer | pem@mysql.com <> | 2003-02-18 15:05:35 +0100 |
commit | 97dc6a528e587f5e996e8ffe414ba1ba092e4e16 (patch) | |
tree | 921e4017c320c9b487bd10d94256dc6227c157f3 /sql/sql_lex.cc | |
parent | aadf481f49e8c58bdc648e0fa2567a6eb8ca5b29 (diff) | |
parent | 59dec76951be9be86740c2c663217f98688843a6 (diff) | |
download | mariadb-git-97dc6a528e587f5e996e8ffe414ba1ba092e4e16.tar.gz |
Merging 4.1 into 5.0
Diffstat (limited to 'sql/sql_lex.cc')
-rw-r--r-- | sql/sql_lex.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 779a109367c..5bd5e69cdb8 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -157,6 +157,7 @@ LEX *lex_start(THD *thd, uchar *buf,uint length) { LEX *lex= &thd->lex; lex->next_state=STATE_START; + lex->buf= buf; lex->end_of_query=(lex->ptr=buf)+length; lex->yylineno = 1; lex->select_lex.create_refs=lex->in_comment=0; @@ -171,6 +172,8 @@ LEX *lex_start(THD *thd, uchar *buf,uint length) lex->yacc_yyss=lex->yacc_yyvs=0; lex->ignore_space=test(thd->variables.sql_mode & MODE_IGNORE_SPACE); lex->sql_command=SQLCOM_END; + lex->sphead= NULL; + lex->spcont= NULL; return lex; } |