summaryrefslogtreecommitdiff
path: root/sql/sql_lex.cc
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2009-08-10 15:46:20 -0300
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2009-08-10 15:46:20 -0300
commiteb94a707842b51e69bb37abfdc655f1c333c13fd (patch)
tree6585c71f3fae15baed31782015d75e99c441df20 /sql/sql_lex.cc
parent48e0a640f9b8bb622bc06fdc39b1d53ce39837a3 (diff)
parent69fbbdc19dd58c8a1a4786accf48c623afe2bfe4 (diff)
downloadmariadb-git-eb94a707842b51e69bb37abfdc655f1c333c13fd.tar.gz
Manual merge.
Diffstat (limited to 'sql/sql_lex.cc')
-rw-r--r--sql/sql_lex.cc9
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)