diff options
author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 10:47:50 -0300 |
---|---|---|
committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 10:47:50 -0300 |
commit | 649390ac814ce5ea1e77b833ab5fe92dfcfe86d5 (patch) | |
tree | ac8b15ac65b08a492c256369b73e372f6568c7a4 /sql/item_strfunc.h | |
parent | 06b8897e8e9a27b6ffc562af90153ab63f30e63e (diff) | |
parent | 8df20918d6751dc1eeb47ab722269dbd9d2da297 (diff) | |
download | mariadb-git-649390ac814ce5ea1e77b833ab5fe92dfcfe86d5.tar.gz |
Merge of mysql-trunk-bugfixing into mysql-trunk-merge.
Diffstat (limited to 'sql/item_strfunc.h')
-rw-r--r-- | sql/item_strfunc.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 2a34babae87..df794ecaaf4 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -82,16 +82,13 @@ public: const char *func_name() const { return "sha"; } }; -class Item_func_sha2 :public Item_str_func +class Item_func_sha2 :public Item_str_ascii_func { public: - Item_func_sha2(Item *a, Item *b) :Item_str_func(a, b) - { - collation.set(&my_charset_bin); - } - String *val_str(String *); - void fix_length_and_dec(); - const char *func_name() const { return "sha2"; } + Item_func_sha2(Item *a, Item *b) :Item_str_ascii_func(a, b) {} + String *val_str_ascii(String *); + void fix_length_and_dec(); + const char *func_name() const { return "sha2"; } }; class Item_func_aes_encrypt :public Item_str_func |