diff options
| author | unknown <jimw@mysql.com> | 2005-08-30 12:25:15 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-08-30 12:25:15 -0700 |
| commit | ed9ecb0696349e290d9341dbb346ca422ccdb723 (patch) | |
| tree | 80d9acd4f0602e4dd05d1e214284da03eabc128b | |
| parent | e6ac9175d13091b8bd7661b5e8ae8d3add81fbb0 (diff) | |
| parent | 6c555e7db556182cd1258b24a583f14dfb2f78bd (diff) | |
| download | mariadb-git-ed9ecb0696349e290d9341dbb346ca422ccdb723.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-12757
into mysql.com:/home/jimw/my/mysql-4.1-clean
| -rw-r--r-- | sql/item_strfunc.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index d0650a1ce11..6962ba7c4ac 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -472,11 +472,11 @@ String *Item_func_des_decrypt::val_str(String *str) struct st_des_keyblock keyblock; struct st_des_keyschedule keyschedule; String *res= args[0]->val_str(str); - uint length=res->length(),tail; + uint length,tail; - if ((null_value=args[0]->null_value)) + if ((null_value= args[0]->null_value)) return 0; - length=res->length(); + length= res->length(); if (length < 9 || (length % 8) != 1 || !((*res)[0] & 128)) return res; // Skip decryption if not encrypted |