diff options
| author | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-06-01 16:00:38 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-06-01 16:00:38 +0400 |
| commit | 7561bc9212a22e3d591033103b7b404503fe721b (patch) | |
| tree | 56315491cf4cef28a3140a8445cc412749dac6d6 /sql/item_strfunc.h | |
| parent | 405bd2af117384e009c3feffe1fd7d9019bf9d2b (diff) | |
| parent | 1b8322c3c6f406bd119145c6f38ddeb802e1b9fc (diff) | |
| download | mariadb-git-7561bc9212a22e3d591033103b7b404503fe721b.tar.gz | |
Manual merge.
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 5265f608344..2cdb45100ae 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -268,7 +268,7 @@ public: String *val_str(String *str); void fix_length_and_dec() { max_length= SCRAMBLED_PASSWORD_CHAR_LENGTH; } const char *func_name() const { return "password"; } - static char *alloc(THD *thd, const char *password); + static char *alloc(THD *thd, const char *password, size_t pass_len); }; @@ -287,7 +287,7 @@ public: String *val_str(String *str); void fix_length_and_dec() { max_length= SCRAMBLED_PASSWORD_CHAR_LENGTH_323; } const char *func_name() const { return "old_password"; } - static char *alloc(THD *thd, const char *password); + static char *alloc(THD *thd, const char *password, size_t pass_len); }; |