1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/home/jimw/my/mysql-4.1-12828

Browse Source 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
This commit is contained in:
jimw@mysql.com 2005-08-30 12:25:50 -07:00
commit 513e24be9e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/item_strfunc.cc
View File

@ -472,11 +472,11 @@ String *Item_func_des_decrypt::val_str(String *str)
struct st_des_keyblock keyblock; struct st_des_keyblock keyblock;
struct st_des_keyschedule keyschedule; struct st_des_keyschedule keyschedule;
String *res= args[0]->val_str(str); 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; return 0;
length=res->length(); length= res->length();
if (length < 9 || (length % 8) != 1 || !((*res)[0] & 128)) if (length < 9 || (length % 8) != 1 || !((*res)[0] & 128))
return res; // Skip decryption if not encrypted return res; // Skip decryption if not encrypted