database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-10728 -- mysqlbinlog can't be input to mysql client

Browse Source 
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.
This commit is contained in:
Vesa Pentti
2017-11-03 08:18:50 +00:00
parent 51679e5c38
commit 9f3c014ca3
4 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/mysql.cc
View File

@ -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));
}

2
mysql-test/r/delimiter_command_case_sensitivity.result Normal file
View File

@ -0,0 +1,2 @@
1
1

3
mysql-test/t/delimiter_case_mdev_10728.sql Normal file
View File

@ -0,0 +1,3 @@
DeLiMiTeR A;
SELECT 1 A;
delimiter ;

2
mysql-test/t/delimiter_command_case_sensitivity.test Normal file
View File

@ -0,0 +1,2 @@
# MDEV-10728
--exec $MYSQL --default-character-set=binary < "t/delimiter_case_mdev_10728.sql"