diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-12-20 07:15:49 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-12-20 07:15:49 -0700 |
| commit | 3f1a5f8bfc3c6238f24b70ff45f73aa67b6b240f (patch) | |
| tree | b14f5a3f11e555c145a890d7d6a2859be133e88d /sql | |
| parent | 33ae32174c403ea1c6e38dd348e6bad9a608fe53 (diff) | |
| download | mariadb-git-3f1a5f8bfc3c6238f24b70ff45f73aa67b6b240f.tar.gz | |
fixed up rpl000014
undid bug in ENCRYPT() - will push this now
added a test case for ENCRYPT()
mysql-test/r/rpl000014.result:
fixed result
mysql-test/t/rpl000014.test:
fixed timing ambiguity
sql/item_strfunc.cc:
undid SEGV bug in ENCRYPT()
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_strfunc.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 8ccea40cdc7..103d82f36aa 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1007,8 +1007,6 @@ String *Item_func_encrypt::val_str(String *str) } pthread_mutex_lock(&LOCK_crypt); char *tmp=crypt(res->c_ptr(),salt_ptr); - tmp = 0; - *tmp = 0; str->set(tmp,(uint) strlen(tmp)); str->copy(); pthread_mutex_unlock(&LOCK_crypt); |