diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-02-07 08:51:20 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-02-07 08:51:20 +0200 |
| commit | 8b6cfda631253c805687d94f2f1aaa17fd2ef0e2 (patch) | |
| tree | 9460953eeb7967bc56383bccc8c7af2adf81a694 /strings/strcoll.ic | |
| parent | 8b97eba31ba3b8af6a93b4836b14d52e1c377900 (diff) | |
| parent | c1eaa385ffb44bdf6264d2cc4b4cc0e10284c88a (diff) | |
| download | mariadb-git-8b6cfda631253c805687d94f2f1aaa17fd2ef0e2.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'strings/strcoll.ic')
| -rw-r--r-- | strings/strcoll.ic | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/strings/strcoll.ic b/strings/strcoll.ic index d30535de0d5..6aca0d0c460 100644 --- a/strings/strcoll.ic +++ b/strings/strcoll.ic @@ -368,7 +368,7 @@ MY_FUNCTION_NAME(strnxfrm)(CHARSET_INFO *cs, static size_t -MY_FUNCTION_NAME(strnxfrm_internal)(CHARSET_INFO *cs, +MY_FUNCTION_NAME(strnxfrm_internal)(CHARSET_INFO *cs __attribute__((unused)), uchar *dst, uchar *de, uint *nweights, const uchar *src, const uchar *se) @@ -490,7 +490,7 @@ MY_FUNCTION_NAME(strnxfrm_nopad)(CHARSET_INFO *cs, static size_t -MY_FUNCTION_NAME(strnxfrm_internal)(CHARSET_INFO *cs, +MY_FUNCTION_NAME(strnxfrm_internal)(CHARSET_INFO *cs __attribute__((unused)), uchar *dst, uchar *de, uint *nweights, const uchar *src, |