mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 11:27:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Manual merge.

Browse source
This commit is contained in:
Alexey Kopytov 2009-06-01 16:00:38 +04:00
commit 7561bc9212
7 changed files with 90 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/item_strfunc.h
View file

@ -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);
};