diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-11-07 23:02:39 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-11-07 23:02:39 +0200 |
| commit | 843e4508c0aa9fe50f750523b64ff04f517a2dea (patch) | |
| tree | 06fa2a83f3e65f28832c46285236d3a5b8b568a1 /client | |
| parent | a4feb04ace2e7759aee4dd74b71cbb1151b1886f (diff) | |
| parent | 5691109689bc40fa303c1b7ddc84b9209ec5f869 (diff) | |
| download | mariadb-git-843e4508c0aa9fe50f750523b64ff04f517a2dea.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'client')
| -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 e4d110ba9eb..4b3a39fe302 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)); } |