diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-08-07 13:37:41 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-08-07 13:39:04 +0200 |
| commit | cd2924bacbb06596d30f4397b0e200fc9c73e40b (patch) | |
| tree | b970692ffd0f2c6ef5e524ae49610d41d0fab23b /sql/field.cc | |
| parent | e08141504011e9a751d3ad1d3d571c725fdc3744 (diff) | |
| download | mariadb-git-cd2924bacbb06596d30f4397b0e200fc9c73e40b.tar.gz | |
MDEV-23330 Server crash or ASAN negative-size-param in my_strnncollsp_binary / SORT_FIELD_ATTR::compare_packed_varstrings
and
MDEV-23414 Assertion `res->charset() == item->collation.collation' failed in Type_handler_string_result::make_packed_sort_key_part
pack_sort_string() *must* take a collation from the Item, not from the
String value. Because when casting a string to _binary the original
String is not copied for performance reasons, it's reused but its
collation does not match Item's collation anymore.
Note, that String's collation cannot be simply changed to _binary,
because for an Item_string literal the original String must stay
unchanged for the duration of the query.
this partially reverts 61c15ebe323
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index 0f4837f20f0..f50ddec1c80 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -1087,7 +1087,7 @@ Field_longstr::pack_sort_string(uchar *to, const SORT_FIELD_ATTR *sort_field) { StringBuffer<LONGLONG_BUFFER_SIZE> buf; val_str(&buf, &buf); - return to + sort_field->pack_sort_string(to, &buf); + return to + sort_field->pack_sort_string(to, &buf, field_charset()); } |