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.h | |
| 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.h')
| -rw-r--r-- | sql/item_strfunc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index ced164554e4..09a7da021c0 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -366,7 +366,7 @@ public: void fix_length_and_dec(); const char *func_name() const { return "encode"; } protected: - virtual void transform(String *); + virtual void crypto_transform(String *); private: /** Provide a seed for the PRNG sequence. */ bool seed(); @@ -379,7 +379,7 @@ public: Item_func_decode(Item *a, Item *seed): Item_func_encode(a, seed) {} const char *func_name() const { return "decode"; } protected: - void transform(String *); + void crypto_transform(String *); }; |