diff options
| author | Alexander Barkov <bar@mariadb.com> | 2020-01-26 20:27:13 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2020-01-28 12:29:23 +0400 |
| commit | f1e13fdc8d9e78f4529aa60b6a9b49c6ff063c66 (patch) | |
| tree | ce84da1deeea573be5be7db7d739a4c9ba9b40f8 /strings/my_strchr.c | |
| parent | dd68ba74f357aca074609cbd77491ed4ba390369 (diff) | |
| download | mariadb-git-f1e13fdc8d9e78f4529aa60b6a9b49c6ff063c66.tar.gz | |
MDEV-21581 Helper functions and methods for CHARSET_INFO
Diffstat (limited to 'strings/my_strchr.c')
| -rw-r--r-- | strings/my_strchr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/strings/my_strchr.c b/strings/my_strchr.c index 6b1564c7ee1..323cbd0a37f 100644 --- a/strings/my_strchr.c +++ b/strings/my_strchr.c @@ -1,5 +1,5 @@ /* Copyright (c) 2005, 2011, Oracle and/or its affiliates. - Copyright (c) 2009-2011, Monty Program Ab + Copyright (c) 2009, 2020, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -38,7 +38,8 @@ const char *acc_end= (ACC) + (LEN); \ for (ptr_str= (STR) ; ptr_str < (END) ; ptr_str+= mbl) \ { \ - mbl= my_charlen_fix((CS), ptr_str, (END)); \ + mbl= my_ci_charlen_fix((CS), (const uchar *) ptr_str, \ + (const uchar *) (END)); \ if (mbl < 2) \ { \ DBUG_ASSERT(mbl == 1); \ |