diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-01-18 17:54:48 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-01-18 17:54:48 +0100 |
| commit | 2d52d3c1bf46d2d5123ee986fff94858899cdf33 (patch) | |
| tree | 31b0004b988f6169bd7f703a66f8ddc3189d332f /sql/item_strfunc.cc | |
| parent | 8aff418ec867419950bc2e0010f679b8f0216829 (diff) | |
| parent | 946d9e4db4896992400cabbd0d1db9a0a10cbfd1 (diff) | |
| download | mariadb-git-2d52d3c1bf46d2d5123ee986fff94858899cdf33.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 939e518e386..a7ca21b79de 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2017, Oracle and/or its affiliates. - Copyright (c) 2009, 2017, MariaDB + Copyright (c) 2009, 2018, MariaDB Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -265,9 +265,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; |