diff options
| author | Alexander Barkov <alexander.barkov@oracle.com> | 2012-03-20 09:16:51 +0400 |
|---|---|---|
| committer | Alexander Barkov <alexander.barkov@oracle.com> | 2012-03-20 09:16:51 +0400 |
| commit | f75dbdd160749ae0f24528c211faccc0a744bc96 (patch) | |
| tree | 2509a4934fc52229e017222f7b9db7622a086acc /sql/field.cc | |
| parent | fb96d8089abcfd4ac8c97cd1989b5a464f1a39c8 (diff) | |
| download | mariadb-git-f75dbdd160749ae0f24528c211faccc0a744bc96.tar.gz | |
Bug#13832953 MY_STRNXFRM_UNICODE: ASSERTION `SRC' FAILED. | MY_STRNXFRM_UNICODE/MAKE_SORTKEY
Problem:
Field_set::val_str in case of an empty SET value
returned a String with str_length==0 and Ptr==0,
which is not expected by some pieces of the code.
Fix:
Returning an empty string with str_length==0 and Ptr=="",
like Field_enum does.
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc index ef66c1ba9bb..59eb83da5fa 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -8257,8 +8257,7 @@ String *Field_set::val_str(String *val_buffer, ulonglong tmp=(ulonglong) Field_enum::val_int(); uint bitnr=0; - val_buffer->length(0); - val_buffer->set_charset(field_charset); + val_buffer->set("", 0, field_charset); while (tmp && bitnr < (uint) typelib->count) { if (tmp & 1) |