diff options
| author | Jonathan Perkin <jperkin@sun.com> | 2008-07-17 17:35:05 +0200 |
|---|---|---|
| committer | mysqldev <mysqldev@production.mysql.com> | 2008-07-17 17:35:05 +0200 |
| commit | 956f8cfeb7ba419001ac836230e10b41633928ce (patch) | |
| tree | 2adbbe973fd52e717a06d246888fa7f8f5ae8461 /sql/sql_lex.cc | |
| parent | 7ab218f8ce31ccf64fba03d8f5466a3dd6d0e15b (diff) | |
| parent | 28e02b178f198e3355a7877393e576ab756e15ab (diff) | |
| download | mariadb-git-956f8cfeb7ba419001ac836230e10b41633928ce.tar.gz | |
Merge from mysql-5.0.66-release
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 468bae02b13..16fab313e61 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1010,21 +1010,8 @@ int MYSQLlex(void *arg, void *yythd) yySkip(); return (SET_VAR); case MY_LEX_SEMICOLON: // optional line terminator - if (yyPeek()) - { - if ((thd->client_capabilities & CLIENT_MULTI_STATEMENTS) && - !lip->stmt_prepare_mode) - { - lex->safe_to_cache_query= 0; - lip->found_semicolon= lip->ptr; - thd->server_status|= SERVER_MORE_RESULTS_EXISTS; - lip->next_state= MY_LEX_END; - return (END_OF_INPUT); - } - state= MY_LEX_CHAR; // Return ';' - break; - } - /* fall true */ + state= MY_LEX_CHAR; // Return ';' + break; case MY_LEX_EOL: if (lip->ptr >= lip->end_of_query) { @@ -1039,7 +1026,7 @@ int MYSQLlex(void *arg, void *yythd) case MY_LEX_END: lip->next_state=MY_LEX_END; return(0); // We found end of input last time - + /* Actually real shouldn't start with . but allow them anyhow */ case MY_LEX_REAL_OR_POINT: if (my_isdigit(cs,yyPeek())) |