diff options
author | unknown <tonu@volk.internalnet> | 2001-11-26 15:54:33 +0200 |
---|---|---|
committer | unknown <tonu@volk.internalnet> | 2001-11-26 15:54:33 +0200 |
commit | a2cafe2cdca257317b6fd339545579f5f8e9bbe3 (patch) | |
tree | 9b1bef0fedd5ece3b9583cf6137d570e4c4de1a2 /sql/item_strfunc.h | |
parent | 7fbb09f4bbfb90e04a00d1b2ce327c2e5039081a (diff) | |
download | mariadb-git-a2cafe2cdca257317b6fd339545579f5f8e9bbe3.tar.gz |
des_encrypt()/des_decrypt() are now ASCII protected and pass testsuite
Diffstat (limited to 'sql/item_strfunc.h')
-rw-r--r-- | sql/item_strfunc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 96a2f30d5c7..31c832c8ddb 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -230,7 +230,7 @@ public: Item_func_des_encrypt(Item *a, Item *b): Item_str_func(a,b) {} Item_func_des_encrypt(Item *a, Item *b, Item *c): Item_str_func(a,b,c) {} String *val_str(String *); - void fix_length_and_dec() { maybe_null=1; max_length = 13; } + void fix_length_and_dec() { maybe_null=1; max_length = args[0]->max_length; } const char *func_name() const { return "des_encrypt"; } }; @@ -242,7 +242,7 @@ public: Item_func_des_decrypt(Item *a, Item *b): Item_str_func(a,b) {} Item_func_des_decrypt(Item *a, Item *b, Item *c): Item_str_func(a,b,c) {} String *val_str(String *); - void fix_length_and_dec() { maybe_null=1; max_length = 13; } + void fix_length_and_dec() { maybe_null=1; max_length = args[0]->max_length; } const char *func_name() const { return "des_decrypt"; } }; |