diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-07 17:11:22 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-07 17:11:22 +0300 |
| commit | 4c89cff5582e786d1cde40b75c2290c136e64e31 (patch) | |
| tree | 098edebe3e6e97ca234bf8842580851f807cd57a /sql/item_strfunc.cc | |
| parent | 4ede2fec4cb7165a469776bfdbf247db86acb297 (diff) | |
| parent | 400a8eb60f832030a04a248e2c96552aa3f44055 (diff) | |
| download | mariadb-git-4c89cff5582e786d1cde40b75c2290c136e64e31.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index cd47257a77b..db1ba15214f 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -318,7 +318,7 @@ String *Item_aes_crypt::val_str(String *str2) { DBUG_ASSERT(fixed == 1); StringBuffer<80> user_key_buf; - String *sptr= args[0]->val_str(&str_value); + String *sptr= args[0]->val_str(&tmp_value); String *user_key= args[1]->val_str(&user_key_buf); uint32 aes_length; |