diff options
| author | Sreeharsha Ramanavarapu <sreeharsha.ramanavarapu@oracle.com> | 2017-09-06 06:45:50 +0530 |
|---|---|---|
| committer | Sreeharsha Ramanavarapu <sreeharsha.ramanavarapu@oracle.com> | 2017-09-06 06:45:50 +0530 |
| commit | ad00de40772614e79ef8f14647d37a7d356cff5c (patch) | |
| tree | 40d113058f5472d733d352d36a1d8e88bc0f8dac /sql/item_strfunc.cc | |
| parent | 9ae160af7647139a321203fa02c4122744e2ba63 (diff) | |
| download | mariadb-git-ad00de40772614e79ef8f14647d37a7d356cff5c.tar.gz | |
Bug #26704451: INCORRECT BEHAVIOR WITH USE OF CERTAIN
CHARSETS AND SHA2
Missed pushing to 5.5.
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index ed02f668060..e2a2ee1b6d8 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -266,9 +266,9 @@ String *Item_func_sha2::val_str_ascii(String *str) size_t input_len; uint digest_length= 0; + input_string= args[0]->val_str(str); str->set_charset(&my_charset_bin); - input_string= args[0]->val_str(str); if (input_string == NULL) { null_value= TRUE; |