diff options
| author | Alexander Barkov <bar@mysql.com> | 2010-07-07 10:38:11 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mysql.com> | 2010-07-07 10:38:11 +0400 |
| commit | 00e86d01a72c539b915e07f4b7b8fe218433fd60 (patch) | |
| tree | e872e3c1b1d8935b62347e5c4fd395d237b68567 /sql/item_strfunc.cc | |
| parent | 72bb9b7acbacc20172512184dc2724fccbc7a741 (diff) | |
| download | mariadb-git-00e86d01a72c539b915e07f4b7b8fe218433fd60.tar.gz | |
Bug#54661 sha2() returns BINARY result
Problem: sha2() reported its result as BINARY
Fix:
- Inheriting Item_func_sha2 from Item_str_ascii_func
- Setting max_length via fix_length_and_charset()
instead of direct assignment.
- Adding tests
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 61febb01e93..2a9eef2298d 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -242,7 +242,7 @@ void Item_func_sha::fix_length_and_dec() fix_length_and_charset(SHA1_HASH_SIZE * 2, default_charset()); } -String *Item_func_sha2::val_str(String *str) +String *Item_func_sha2::val_str_ascii(String *str) { DBUG_ASSERT(fixed == 1); #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) @@ -338,19 +338,19 @@ void Item_func_sha2::fix_length_and_dec() switch (sha_variant) { #ifndef OPENSSL_NO_SHA512 case 512: - max_length= SHA512_DIGEST_LENGTH*2; + fix_length_and_charset(SHA512_DIGEST_LENGTH * 2, default_charset()); break; case 384: - max_length= SHA384_DIGEST_LENGTH*2; + fix_length_and_charset(SHA384_DIGEST_LENGTH * 2, default_charset()); break; #endif #ifndef OPENSSL_NO_SHA256 case 256: case 0: // SHA-256 is the default - max_length= SHA256_DIGEST_LENGTH*2; + fix_length_and_charset(SHA256_DIGEST_LENGTH * 2, default_charset()); break; case 224: - max_length= SHA224_DIGEST_LENGTH*2; + fix_length_and_charset(SHA224_DIGEST_LENGTH * 2, default_charset()); break; #endif default: |