diff options
| author | konstantin@oak.local <> | 2003-12-19 20:52:13 +0300 |
|---|---|---|
| committer | konstantin@oak.local <> | 2003-12-19 20:52:13 +0300 |
| commit | d37da004f6ffb32d170ce4cb9d93ba166de5b6b0 (patch) | |
| tree | a4c72a1d62170f1e5637ed34fd09ada369f1c764 /sql/sql_lex.cc | |
| parent | c49773237d2bb807e10ffb66c321f87a20f1e1c6 (diff) | |
| download | mariadb-git-d37da004f6ffb32d170ce4cb9d93ba166de5b6b0.tar.gz | |
THD::lex now points to THD::main_lex like in 5.0
All tests pass (client_test included)
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 4257df494bc..de0d6ade618 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -115,7 +115,7 @@ void lex_free(void) LEX *lex_start(THD *thd, uchar *buf,uint length) { - LEX *lex= &thd->lex; + LEX *lex= thd->lex; lex->thd= thd; lex->next_state=MY_LEX_START; lex->end_of_query=(lex->ptr=buf)+length; @@ -433,7 +433,7 @@ int yylex(void *arg, void *yythd) int tokval, result_state; uint length; enum my_lex_states state; - LEX *lex= &(((THD *)yythd)->lex); + LEX *lex= ((THD *)yythd)->lex; YYSTYPE *yylval=(YYSTYPE*) arg; CHARSET_INFO *cs= ((THD *) yythd)->charset(); uchar *state_map= cs->state_map; |