diff options
| author | sasha@mysql.sashanet.com <> | 2000-12-18 11:09:45 -0700 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2000-12-18 11:09:45 -0700 |
| commit | eccd463bd2c45ef90c0e0e2526bbb12ad4569d04 (patch) | |
| tree | 443950493e879f0459cce1ab3188b62f77ccd30c /sql/item_strfunc.cc | |
| parent | bed1668e238593454c756a1f3f68a4e0be5ec929 (diff) | |
| download | mariadb-git-eccd463bd2c45ef90c0e0e2526bbb12ad4569d04.tar.gz | |
fixed logging bug in generate_table()
added message on all segfaults, and numeric backtrace of Linux i386
introduced a bug into ENCRYPT() to test backtrace - will clean up
before push, but need this commit locally to pull on slave repositories
to do further testing
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 103d82f36aa..8ccea40cdc7 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1007,6 +1007,8 @@ 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); |