diff options
author | Alexander Barkov <bar@mariadb.org> | 2016-05-17 15:27:10 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.org> | 2016-05-17 15:27:10 +0400 |
commit | e7ff281d2e954f9ab7f08a3e1a425a3c59e8f796 (patch) | |
tree | e8e3903a609daef952785e28e5c876bafd52ba7b /storage/federatedx/ha_federatedx.cc | |
parent | 7e66a24dfb381290d59786c36e1dc478ad365bd1 (diff) | |
download | mariadb-git-e7ff281d2e954f9ab7f08a3e1a425a3c59e8f796.tar.gz |
MDEV-6353 my_ismbchar() and my_mbcharlen() refactoring
Diffstat (limited to 'storage/federatedx/ha_federatedx.cc')
-rw-r--r-- | storage/federatedx/ha_federatedx.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/federatedx/ha_federatedx.cc b/storage/federatedx/ha_federatedx.cc index 890d1bff292..56d900c6720 100644 --- a/storage/federatedx/ha_federatedx.cc +++ b/storage/federatedx/ha_federatedx.cc @@ -500,8 +500,7 @@ bool append_ident(String *string, const char *name, uint length, for (name_end= name+length; name < name_end; name+= clen) { uchar c= *(uchar *) name; - if (!(clen= my_mbcharlen(system_charset_info, c))) - clen= 1; + clen= my_charlen_fix(system_charset_info, name, name_end); if (clen == 1 && c == (uchar) quote_char && (result= string->append("e_char, 1, system_charset_info))) goto err; |