diff options
| author | Leonard Zhou <leonard@mysql.com> | 2009-03-24 15:29:04 +0800 |
|---|---|---|
| committer | Leonard Zhou <leonard@mysql.com> | 2009-03-24 15:29:04 +0800 |
| commit | dad07ffe9ed5711b66d86d18d9cdf814f472d49a (patch) | |
| tree | 28a35254e0bc06cde57ecc5bfb2c40e5e9d9e6fa /sql/sql_lex.cc | |
| parent | 5fdc5510ec1abcfe3f3f74a229ae3102533f46c4 (diff) | |
| parent | fbb90c66d79fcb221589ba5907e20b923d5deacf (diff) | |
| download | mariadb-git-dad07ffe9ed5711b66d86d18d9cdf814f472d49a.tar.gz | |
Merge
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 71aa80b8170..4c53772bc25 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -858,7 +858,7 @@ int MYSQLlex(void *arg, void *yythd) case MY_LEX_HEX_NUMBER: // Found x'hexstring' yyGet(); // Skip ' while (my_isxdigit(cs,(c = yyGet()))) ; - length=(lip->ptr - lip->tok_start); // Length of hexnum+3 + length=(uint) (lip->ptr - lip->tok_start); // Length of hexnum+3 if (!(length & 1) || c != '\'') { return(ABORT_SYM); // Illegal hex constant @@ -872,7 +872,7 @@ int MYSQLlex(void *arg, void *yythd) case MY_LEX_BIN_NUMBER: // Found b'bin-string' yyGet(); // Skip ' while ((c= yyGet()) == '0' || c == '1'); - length= (lip->ptr - lip->tok_start); // Length of bin-num + 3 + length= (uint) (lip->ptr - lip->tok_start); // Length of bin-num + 3 if (c != '\'') return(ABORT_SYM); // Illegal hex constant yyGet(); // get_token makes an unget |