diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-31 01:06:50 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-31 01:06:50 +0300 |
| commit | 2b0f6b5ace4b455344dc25e400873d3d68c90090 (patch) | |
| tree | 64c1a58bb6f6f5516fbf930759b54e0081b98b90 /sql/item_strfunc.cc | |
| parent | 22e0e72370ddbd95d0438b769ac5dda82b2c9b0a (diff) | |
| parent | d9e9a73e8f1355a24b27d64d56d555d045ee0b4c (diff) | |
| download | mariadb-git-2b0f6b5ace4b455344dc25e400873d3d68c90090.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- mysql-test/suite/rpl/r/rpl_binlog_grant.result
- mysql-test/suite/rpl/r/rpl_sp.result
- mysql-test/suite/rpl/t/rpl_binlog_grant.test
- sql/sql_parse.cc
- sql/sql_table.cc
- sql/sql_test.cc
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 0286a51683a..c33e0f4c6fb 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1765,19 +1765,19 @@ String *Item_func_encode::val_str(String *str) null_value= 0; res= copy_if_not_alloced(str, res, res->length()); - transform(res); + crypto_transform(res); sql_crypt.reinit(); return res; } -void Item_func_encode::transform(String *res) +void Item_func_encode::crypto_transform(String *res) { sql_crypt.encode((char*) res->ptr(),res->length()); res->set_charset(&my_charset_bin); } -void Item_func_decode::transform(String *res) +void Item_func_decode::crypto_transform(String *res) { sql_crypt.decode((char*) res->ptr(),res->length()); } |