diff options
| author | unknown <peter@mysql.com> | 2002-10-06 13:42:16 +0400 |
|---|---|---|
| committer | unknown <peter@mysql.com> | 2002-10-06 13:42:16 +0400 |
| commit | 8640cd354413508b698817dce787827c370e7b9a (patch) | |
| tree | ec440e8cca80b5a48de9c9b085968243421b8b8d /include/mysql_com.h | |
| parent | 748191fd807d6f380b48b9331a8d8cf333d2bb45 (diff) | |
| download | mariadb-git-8640cd354413508b698817dce787827c370e7b9a.tar.gz | |
One more commit to do the merge of new 4.1 tree
client/mysqladmin.c:
Handle new password.c prototypes
include/mysql_com.h:
New prototypes
libmysql/Makefile.shared:
Client need sha1 compiled in now
libmysql/password.c:
Replace copy with symlink
mysql-test/r/func_crypt.result:
Fix test results to handle new password function
mysql-test/t/func_crypt.test:
New tests for new password function
sql/item_create.cc:
add old_password() function
sql/item_create.h:
add old_password() function
sql/item_strfunc.cc:
add old_password() function
changes to new password.c functions prototypes
sql/item_strfunc.h:
add old_password function
handle new prototypes
sql/lex.h:
add OLD_PASSWORD function
sql/password.c:
Continue to work on new password handling
sql/sql_acl.cc:
Handle new passwords
sql/sql_yacc.yy:
Changes for new prototypes
Diffstat (limited to 'include/mysql_com.h')
| -rw-r--r-- | include/mysql_com.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index 5ed65e993d9..a529dbc127b 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -274,8 +274,9 @@ extern unsigned long net_buffer_length; void randominit(struct rand_struct *,unsigned long seed1, unsigned long seed2); double rnd(struct rand_struct *); -void make_scrambled_password(char *to,const char *password); -uint get_password_length(); +void make_scrambled_password(char *to,const char *password,my_bool force_old_scramble); +uint get_password_length(my_bool force_old_scramble); +uint8 get_password_version(const char* password); void get_salt_from_password(unsigned long *res,const char *password); void make_password_from_salt(char *to, unsigned long *hash_res); char *scramble(char *to,const char *message,const char *password, |