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/sql_acl.cc | |
| parent | dd68ba74f357aca074609cbd77491ed4ba390369 (diff) | |
| download | mariadb-git-f1e13fdc8d9e78f4529aa60b6a9b49c6ff063c66.tar.gz | |
MDEV-21581 Helper functions and methods for CHARSET_INFO
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 4c8eaee3145..26fc365b74a 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2018, Oracle and/or its affiliates. - Copyright (c) 2009, 2019, MariaDB Corporation. + 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 @@ -4170,7 +4170,7 @@ bool hostname_requires_resolving(const char *hostname) if (hostname == my_localhost || (hostname_len == localhost_len && - !my_strnncoll(system_charset_info, + !system_charset_info->strnncoll( (const uchar *) hostname, hostname_len, (const uchar *) my_localhost, strlen(my_localhost)))) { @@ -12765,7 +12765,7 @@ static bool find_mpvio_user(MPVIO_EXT *mpvio) */ ulong nr1=1, nr2=4; CHARSET_INFO *cs= &my_charset_latin1; - cs->coll->hash_sort(cs, (uchar*) sctx->user, strlen(sctx->user), &nr1, &nr2); + cs->hash_sort((uchar*) sctx->user, strlen(sctx->user), &nr1, &nr2); mysql_mutex_lock(&acl_cache->lock); if (!acl_users.elements) |