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_signal.cc | |
| parent | dd68ba74f357aca074609cbd77491ed4ba390369 (diff) | |
| download | mariadb-git-f1e13fdc8d9e78f4529aa60b6a9b49c6ff063c66.tar.gz | |
MDEV-21581 Helper functions and methods for CHARSET_INFO
Diffstat (limited to 'sql/sql_signal.cc')
| -rw-r--r-- | sql/sql_signal.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_signal.cc b/sql/sql_signal.cc index 1b1d2fe0f31..115f5fa4347 100644 --- a/sql/sql_signal.cc +++ b/sql/sql_signal.cc @@ -1,4 +1,5 @@ /* Copyright (c) 2008, 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 @@ -104,7 +105,7 @@ static bool assign_fixed_string(MEM_ROOT *mem_root, src_cs= src->charset(); src_len= src->length(); src_end= src_str + src_len; - numchars= src_cs->cset->numchars(src_cs, src_str, src_end); + numchars= src_cs->numchars(src_str, src_end); if (numchars <= max_char) { @@ -114,7 +115,7 @@ static bool assign_fixed_string(MEM_ROOT *mem_root, else { numchars= max_char; - to_copy= dst_cs->cset->charpos(dst_cs, src_str, src_end, numchars); + to_copy= dst_cs->charpos(src_str, src_end, numchars); truncated= true; } |