diff options
author | tomas@poseidon.ndb.mysql.com <> | 2004-10-04 12:36:25 +0000 |
---|---|---|
committer | tomas@poseidon.ndb.mysql.com <> | 2004-10-04 12:36:25 +0000 |
commit | bc5ca3a1ce5eddc3a9af7127436cc5351e98f95e (patch) | |
tree | ec5d39434f9ac915787ec351d6255a032ad26e31 /sql/sql_show.cc | |
parent | 1e66b6b3a6929ed169da9c87f43f2b808b0a35bc (diff) | |
parent | dd3cc0c1e9385182f4dd1ca2021cae92b9992a42 (diff) | |
download | mariadb-git-bc5ca3a1ce5eddc3a9af7127436cc5351e98f95e.tar.gz |
Merge
Diffstat (limited to 'sql/sql_show.cc')
-rw-r--r-- | sql/sql_show.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 413de53f4bc..bd145a1de59 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1140,7 +1140,7 @@ static const char *require_quotes(const char *name, uint name_length) for ( ; name < end ; name++) { uchar chr= (uchar) *name; - length= my_mbcharlen(system_charset_info, chr); + length= my_mbcharlen(system_charset_info, (uchar) chr); if (length == 1 && !system_charset_info->ident_map[chr]) return name; } @@ -1169,7 +1169,7 @@ append_identifier(THD *thd, String *packet, const char *name, uint length) for (name_end= name+length ; name < name_end ; name+= length) { char chr= *name; - length= my_mbcharlen(system_charset_info, chr); + length= my_mbcharlen(system_charset_info, (uchar) chr); if (length == 1 && chr == quote_char) packet->append("e_char, 1, system_charset_info); packet->append(name, length, packet->charset()); |