diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-12-19 18:03:24 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-12-19 18:03:24 -0700 |
| commit | d029966f6340803cc94ddbb2b0dc268ccc51b77e (patch) | |
| tree | 42c873ed3567a42133516d4b81e8734c36f4856e /sql/item_strfunc.cc | |
| parent | 27336dfe8fbd4e12b06e99778de5d8c1c7e837f0 (diff) | |
| parent | 8310a70cc1ed7d6fb48ab4d86ae6ffd7ed8e231b (diff) | |
| download | mariadb-git-d029966f6340803cc94ddbb2b0dc268ccc51b77e.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
sql/mysqld.cc:
Auto merged
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); |