diff options
| author | Chad MILLER <chad@mysql.com> | 2009-04-14 13:20:13 -0400 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2009-04-14 13:20:13 -0400 |
| commit | 14f923c0286588f9f391a2fda8b9fab5a4e2953c (patch) | |
| tree | 55596b47965261462217616f8271d0c2b9d79ab0 /sql/sql_lex.cc | |
| parent | 9d7f61dc698ee6b1dd379cc5820c59b8a9806c2d (diff) | |
| parent | bd2db28cdad7e715b9efcee2f440f432a0562e8f (diff) | |
| download | mariadb-git-14f923c0286588f9f391a2fda8b9fab5a4e2953c.tar.gz | |
Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.
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 de2e5867955..d48dacf75d7 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 |