diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-08-10 15:46:20 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-08-10 15:46:20 -0300 |
| commit | 19b325499e08a7378d01d9eebb2b431821c35dc0 (patch) | |
| tree | 6585c71f3fae15baed31782015d75e99c441df20 /sql/sql_lex.cc | |
| parent | 527e5fd3a246cc21bdaa3e15952b61bd3e13ebcd (diff) | |
| parent | c7163c630a7ab5c9770c9ae07355acc531f110a1 (diff) | |
| download | mariadb-git-19b325499e08a7378d01d9eebb2b431821c35dc0.tar.gz | |
Manual merge.
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 444a8ae0736..2adbc44eb12 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1105,9 +1105,12 @@ int MYSQLlex(void *arg, void *yythd) } } #ifdef USE_MB - else if (var_length < 1) - break; // Error - lip->skip_binary(var_length-1); + else if (use_mb(cs)) + { + if ((var_length= my_ismbchar(cs, lip->get_ptr() - 1, + lip->get_end_of_query()))) + lip->skip_binary(var_length-1); + } #endif } if (double_quotes) |