diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 11:38:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 11:38:21 +0300 |
| commit | 4a7dfda373ff9e28e4f4f35bad76cbfc20934a9a (patch) | |
| tree | c8b327da16aa30bc5a26bfa31a2563af1c6f4976 /sql/item_strfunc.cc | |
| parent | ff77a09bda884fe6bf3917eb29b9d3a2f53f919b (diff) | |
| parent | 2bb8d7c2f36439ab6a3944476665eb1218c36f5c (diff) | |
| download | mariadb-git-4a7dfda373ff9e28e4f4f35bad76cbfc20934a9a.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 361feb9055d..4591fb7801e 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -359,6 +359,8 @@ String *Item_aes_crypt::val_str(String *str2) rkey, AES_KEY_LENGTH / 8, 0, 0)) { str2->length((uint) aes_length); + DBUG_ASSERT(collation.collation == &my_charset_bin); + str2->set_charset(&my_charset_bin); return str2; } } |