diff options
| author | Daniel Black <daniel@mariadb.org> | 2022-03-16 17:51:49 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2022-03-17 17:03:24 +1100 |
| commit | b73d85277939e3edff90e1ff927218a541a2c136 (patch) | |
| tree | 89d82c9686e5f28689ef9546dbe5fe8b47009ce4 /sql/sql_class.h | |
| parent | 73fee39ea62037780c59161507e89dd76c10b7a3 (diff) | |
| parent | 069139a549a62f26d566c1aea2a49c13e9e8a654 (diff) | |
| download | mariadb-git-b73d85277939e3edff90e1ff927218a541a2c136.tar.gz | |
Merge 10.4 to 10.5
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 6b6ef2156fe..65b039d89fb 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -3899,6 +3899,8 @@ public: bool convert_string(LEX_STRING *to, CHARSET_INFO *to_cs, const char *from, size_t from_length, CHARSET_INFO *from_cs); + bool reinterpret_string_from_binary(LEX_CSTRING *to, CHARSET_INFO *to_cs, + const char *from, size_t from_length); bool convert_string(LEX_CSTRING *to, CHARSET_INFO *to_cs, const char *from, size_t from_length, CHARSET_INFO *from_cs) @@ -3915,6 +3917,8 @@ public: { if (!simple_copy_is_possible) return unlikely(convert_string(to, tocs, from->str, from->length, fromcs)); + if (fromcs == &my_charset_bin) + return reinterpret_string_from_binary(to, tocs, from->str, from->length); *to= *from; return false; } |