diff options
| author | unknown <igor@rurik.mysql.com> | 2005-03-09 10:58:52 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-03-09 10:58:52 -0800 |
| commit | 85be2e57ab807e98c8620b0204d864602920bc89 (patch) | |
| tree | 9003f0838a291edb951f927a9de4ed0c93e8a96b /sql/item_strfunc.cc | |
| parent | 914afabd39ebc9884ce0e6f65c36253067b3fe15 (diff) | |
| parent | 44d66d26dc6dbf1e7c90dc3c4cffe7b5d4baba41 (diff) | |
| download | mariadb-git-85be2e57ab807e98c8620b0204d864602920bc89.tar.gz | |
Manual merge
sql/item_strfunc.cc:
Auto merged
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 46c1222163e..54dd3b2d1b0 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -235,6 +235,7 @@ String *Item_func_aes_decrypt::val_str(String *str) void Item_func_aes_decrypt::fix_length_and_dec() { max_length=args[0]->max_length; + maybe_null= 1; } |