diff options
| author | Vesa Pentti <vesa.pentti@mariadb.net> | 2017-11-03 08:18:50 +0000 |
|---|---|---|
| committer | Vesa Pentti <vesa.pentti@mariadb.net> | 2017-11-06 12:56:56 +0000 |
| commit | 9f3c014ca3e5b58cfbbe33ee6ffccbb99cc4a356 (patch) | |
| tree | a477c329a0af32ddbf1d2479f97ce266f1285e87 /client/mysql.cc | |
| parent | 51679e5c380e3a140c78a611c28d99bd3a8be2da (diff) | |
| download | mariadb-git-9f3c014ca3e5b58cfbbe33ee6ffccbb99cc4a356.tar.gz | |
MDEV-10728 -- mysqlbinlog can't be input to mysql client
String comparison with utf8_bin collation is case sensitive.
Hence "DELIMITER" did not match with "delimiter".
The delimiter command matching now uses my_charset_latin1.
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index f581bfcafae..c043d054ea5 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1094,7 +1094,7 @@ inline bool is_delimiter_command(char *name, ulong len) only name(first DELIMITER_NAME_LEN bytes) is checked. */ return (len >= DELIMITER_NAME_LEN && - !my_strnncoll(charset_info, (uchar*) name, DELIMITER_NAME_LEN, + !my_strnncoll(&my_charset_latin1, (uchar*) name, DELIMITER_NAME_LEN, (uchar *) DELIMITER_NAME, DELIMITER_NAME_LEN)); } |