diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-07-25 22:24:40 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-07-25 22:24:40 +0200 |
commit | cb5952b5060d089c021808fe1f1cf13f7eb88423 (patch) | |
tree | 1e4678bd3b899428428b4f7980b92fade8e57f62 /strings/ctype-bin.c | |
parent | 57cde8ccd19675dc98e3cbacf0ef5c72cb188e49 (diff) | |
parent | 9fbe360e9f7d41d169eb5abed22dc15f26f6c749 (diff) | |
download | mariadb-git-cb5952b5060d089c021808fe1f1cf13f7eb88423.tar.gz |
Merge branch '10.0' into bb-10.1-merge-sanja
Diffstat (limited to 'strings/ctype-bin.c')
-rw-r--r-- | strings/ctype-bin.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/strings/ctype-bin.c b/strings/ctype-bin.c index 0be6ae95577..dfeb77d8d6b 100644 --- a/strings/ctype-bin.c +++ b/strings/ctype-bin.c @@ -220,11 +220,11 @@ static size_t my_case_str_bin(CHARSET_INFO *cs __attribute__((unused)), static size_t my_case_bin(CHARSET_INFO *cs __attribute__((unused)), - char *src __attribute__((unused)), - size_t srclen, - char *dst __attribute__((unused)), - size_t dstlen __attribute__((unused))) + const char *src, size_t srclen, + char *dst, size_t dstlen) { + DBUG_ASSERT(srclen <= dstlen); + memcpy(dst, src, srclen); return srclen; } |