diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-05-18 15:45:55 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-05-18 15:45:55 +0300 |
| commit | 45898c20928ae71f2c28dca48e66c661b9545347 (patch) | |
| tree | 4b12470d4ee5dc1845d6e5680f5a67ac210195a6 /sql/sql_lex.cc | |
| parent | 0e3ca225ad65f14da79c9a73aeadcc2a3e1c0c2a (diff) | |
| parent | 648d86615043e76633ac536b1000ba86abbc8af1 (diff) | |
| download | mariadb-git-45898c20928ae71f2c28dca48e66c661b9545347.tar.gz | |
Merge remote-tracking branch 'origin/10.0' into 10.0
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 9351b7f61a9..19568bdd42c 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2014, Oracle and/or its affiliates. - Copyright (c) 2009, 2016, MariaDB + Copyright (c) 2009, 2017, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1174,12 +1174,14 @@ static int lex_one_token(YYSTYPE *yylval, THD *thd) state= MY_LEX_HEX_NUMBER; break; } + /* fall through */ case MY_LEX_IDENT_OR_BIN: if (lip->yyPeek() == '\'') { // Found b'bin-number' state= MY_LEX_BIN_NUMBER; break; } + /* fall through */ case MY_LEX_IDENT: const char *start; #if defined(USE_MB) && defined(USE_MB_IDENT) @@ -1527,6 +1529,7 @@ static int lex_one_token(YYSTYPE *yylval, THD *thd) break; } /* " used for strings */ + /* fall through */ case MY_LEX_STRING: // Incomplete text string if (!(yylval->lex_str.str = get_text(lip, 1, 1))) { |