diff options
| author | monty@mysql.com <> | 2005-07-03 14:17:52 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-07-03 14:17:52 +0300 |
| commit | 86d7b02199faddf91f9c7d7a6d62dda101be36ed (patch) | |
| tree | bf06496ea5d097316e5972a5cf4c4d5f674fb90b /sql/item_strfunc.cc | |
| parent | 2941da3971a13318836ca85e204e49e3bb034253 (diff) | |
| parent | 62173c5a9d8fcd1f9b365f3cbf14198d06b2170e (diff) | |
| download | mariadb-git-86d7b02199faddf91f9c7d7a6d62dda101be36ed.tar.gz | |
Merge with 4.1
Diffstat (limited to 'sql/item_strfunc.cc')
| -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 40c4c501222..1ad65fb6208 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -371,8 +371,8 @@ String *Item_func_des_encrypt::val_str(String *str) uint key_number, res_length, tail; String *res= args[0]->val_str(str); - if ((null_value=args[0]->null_value)) - goto error; + if ((null_value= args[0]->null_value)) + return 0; // ENCRYPT(NULL) == NULL if ((res_length=res->length()) == 0) return &my_empty_string; @@ -464,7 +464,7 @@ String *Item_func_des_decrypt::val_str(String *str) uint length= 0, tail; if ((null_value=args[0]->null_value)) - goto error; + return 0; length=res->length(); if (length < 9 || (length % 8) != 1 || !((*res)[0] & 128)) return res; // Skip decryption if not encrypted |