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 | bdcce95f1347c9e24257a21096cc6f4e6c085c9e (patch) | |
| tree | 56315491cf4cef28a3140a8445cc412749dac6d6 /sql/item_strfunc.h | |
| parent | 9cc4cb0ea1f429983ce7ee8783504fa7fb5c2d7f (diff) | |
| parent | 2df531fdc44a1bf410a79624932533ecb44f84ce (diff) | |
| download | mariadb-git-bdcce95f1347c9e24257a21096cc6f4e6c085c9e.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); }; |