diff options
| author | unknown <igor@rurik.mysql.com> | 2005-03-09 16:53:20 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-03-09 16:53:20 -0800 |
| commit | 83fa3560bc13734b2d92c84064d836fd2e05bc8d (patch) | |
| tree | 323b4ef95a894e973d0d6fe11eba38be1a6e725e /sql/item_strfunc.cc | |
| parent | ab32d7b000d08f50dc482a0b40eba48dd45f46e9 (diff) | |
| parent | e1d3524d814022c3df689917ead8d8eda17db834 (diff) | |
| download | mariadb-git-83fa3560bc13734b2d92c84064d836fd2e05bc8d.tar.gz | |
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
mysql-test/r/func_str.result:
Auto merged
mysql-test/t/func_str.test:
Auto merged
netware/BUILD/mwenv:
Auto merged
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 298418e1574..a9ec7139ea7 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -225,6 +225,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; } |