diff options
| author | unknown <paul@ice.snake.net> | 2003-11-20 21:16:45 -0600 |
|---|---|---|
| committer | unknown <paul@ice.snake.net> | 2003-11-20 21:16:45 -0600 |
| commit | 8848cea28797c2e08898bbcb782b6c830ee3f42e (patch) | |
| tree | f2eeb7a0a664a31f9501f6e5c189eb8c5fbe39ab /sql/sql_lex.cc | |
| parent | ceb98b62bb5849445755ee75a690418087693f0e (diff) | |
| parent | 3ca0fa152506f7b28fe9a960409859abb1b4958c (diff) | |
| download | mariadb-git-8848cea28797c2e08898bbcb782b6c830ee3f42e.tar.gz | |
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Users/paul/mysql-4.1
mysql-test/r/rpl_loaddata.result:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index bc87f6aaabc..981e5e1e026 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -432,7 +432,7 @@ int yylex(void *arg, void *yythd) reg1 uchar c; int tokval, result_state; uint length; - enum my_lex_states state,prev_state; + enum my_lex_states state; LEX *lex= &(((THD *)yythd)->lex); YYSTYPE *yylval=(YYSTYPE*) arg; CHARSET_INFO *cs= ((THD *) yythd)->charset(); @@ -441,7 +441,7 @@ int yylex(void *arg, void *yythd) lex->yylval=yylval; // The global state lex->tok_start=lex->tok_end=lex->ptr; - prev_state=state=lex->next_state; + state=lex->next_state; lex->next_state=MY_LEX_OPERATOR_OR_IDENT; LINT_INIT(c); for (;;) @@ -1175,7 +1175,7 @@ void st_select_lex_unit::exclude_level() */ void st_select_lex_unit::exclude_tree() { - SELECT_LEX_UNIT *units= 0, **units_last= &units; + SELECT_LEX_UNIT *units= 0; for (SELECT_LEX *sl= first_select(); sl; sl= sl->next_select()) { // unlink current level from global SELECTs list |