diff options
| author | Monty <monty@mariadb.org> | 2017-11-09 23:21:41 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2017-11-09 23:21:41 +0200 |
| commit | 0bb0d52221af99c46d17486382806caa6dd7338e (patch) | |
| tree | 92b2ddfceaf8df5be6d47774b25fd3006ac5bb35 /client/mysql.cc | |
| parent | 7dbff2c513aeec3b3f3d0fa4952ae97deba22282 (diff) | |
| parent | d40c23570ff1a9ba5aa317b85a32a4b27780b8ab (diff) | |
| download | mariadb-git-0bb0d52221af99c46d17486382806caa6dd7338e.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Conflicts:
mysql-test/r/cte_recursive.result
mysql-test/r/derived_cond_pushdown.result
mysql-test/t/cte_recursive.test
mysql-test/t/derived_cond_pushdown.test
sql/datadict.cc
sql/handler.cc
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 5fe940eeca7..50114ee8b65 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)); } |