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 /sql/discover.cc | |
| parent | dd68ba74f357aca074609cbd77491ed4ba390369 (diff) | |
| download | mariadb-git-f1e13fdc8d9e78f4529aa60b6a9b49c6ff063c66.tar.gz | |
MDEV-21581 Helper functions and methods for CHARSET_INFO
Diffstat (limited to 'sql/discover.cc')
| -rw-r--r-- | sql/discover.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/discover.cc b/sql/discover.cc index 3df777c19ba..3e41388ed51 100644 --- a/sql/discover.cc +++ b/sql/discover.cc @@ -1,4 +1,5 @@ /* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. + 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 @@ -206,12 +207,12 @@ int extension_based_table_discovery(MY_DIR *dirp, const char *ext_meta, size_t len= (octothorp ? octothorp : ext) - cur->name; if (from != cur && (strlen(from->name) <= len || - my_strnncoll(cs, (uchar*)from->name, len, (uchar*)cur->name, len) || + cs->strnncoll(from->name, len, cur->name, len) || (from->name[len] != FN_EXTCHAR && from->name[len] != '#'))) advance(from, to, cur, skip); - if (my_strnncoll(cs, (uchar*)ext, strlen(ext), - (uchar*)ext_meta, ext_meta_len) == 0) + if (cs->strnncoll(ext, strlen(ext), + ext_meta, ext_meta_len) == 0) { *ext = 0; if (result->add_file(cur->name)) @@ -255,8 +256,8 @@ int ext_table_discovery_simple(MY_DIR *dirp, if (ext) { - if (my_strnncoll(cs, (uchar*)ext, strlen(ext), - (uchar*)reg_ext, reg_ext_length) == 0) + if (cs->strnncoll(ext, strlen(ext), + reg_ext, reg_ext_length) == 0) { *ext = 0; if (result->add_file(cur->name)) |