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_load.cc | |
| parent | dd68ba74f357aca074609cbd77491ed4ba390369 (diff) | |
| download | mariadb-git-f1e13fdc8d9e78f4529aa60b6a9b49c6ff063c66.tar.gz | |
MDEV-21581 Helper functions and methods for CHARSET_INFO
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 89cc3f8da64..6d3f9e540a7 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2016, Oracle and/or its affiliates. - Copyright (c) 2010, 2018, MariaDB Corporation. + Copyright (c) 2010, 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 @@ -190,7 +190,7 @@ class READ_INFO: public Load_data_param bool read_mbtail(String *str) { int chlen; - if ((chlen= my_charlen(charset(), str->end() - 1, str->end())) == 1) + if ((chlen= charset()->charlen(str->end() - 1, str->end())) == 1) return false; // Single byte character found for (uint32 length0= str->length() - 1 ; MY_CS_IS_TOOSMALL(chlen); ) { @@ -201,7 +201,7 @@ class READ_INFO: public Load_data_param return true; // EOF } str->append(chr); - chlen= my_charlen(charset(), str->ptr() + length0, str->end()); + chlen= charset()->charlen(str->ptr() + length0, str->end()); if (chlen == MY_CS_ILSEQ) { /** @@ -1587,7 +1587,7 @@ int READ_INFO::read_field() } } data.append(chr); - if (use_mb(charset()) && read_mbtail(&data)) + if (charset()->use_mb() && read_mbtail(&data)) goto found_eof; } /* @@ -1686,8 +1686,8 @@ int READ_INFO::next_line() if (getbyte(&buf[0])) return 1; // EOF - if (use_mb(charset()) && - (chlen= my_charlen(charset(), buf, buf + 1)) != 1) + if (charset()->use_mb() && + (chlen= charset()->charlen(buf, buf + 1)) != 1) { uint i; for (i= 1; MY_CS_IS_TOOSMALL(chlen); ) @@ -1696,7 +1696,7 @@ int READ_INFO::next_line() DBUG_ASSERT(chlen != 1); if (getbyte(&buf[i++])) return 1; // EOF - chlen= my_charlen(charset(), buf, buf + i); + chlen= charset()->charlen(buf, buf + i); } /* @@ -1867,7 +1867,7 @@ int READ_INFO::read_value(int delim, String *val) else { val->append(chr); - if (use_mb(charset()) && read_mbtail(val)) + if (charset()->use_mb() && read_mbtail(val)) return my_b_EOF; } } |