diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-02-27 17:36:54 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-02-27 17:36:54 -0500 |
| commit | af651c80f7d7b49a141958a68e81f2de90e62f25 (patch) | |
| tree | fe6beb28814b0e5a149dde1597463c8fe9faa177 /include | |
| parent | f02fdb6b55a2b29595cb7e4eed48a51755e967fb (diff) | |
| parent | 5c66abf0b0de6d632f85a57c841f80d28a7e0337 (diff) | |
| download | mariadb-git-af651c80f7d7b49a141958a68e81f2de90e62f25.tar.gz | |
Merge tag 'mariadb-10.0.17' into 10.0-galera
Conflicts:
storage/innobase/include/trx0trx.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql_com.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index 43be28f87a0..8fdac38dd66 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -618,14 +618,17 @@ void scramble_323(char *to, const char *message, const char *password); my_bool check_scramble_323(const unsigned char *reply, const char *message, unsigned long *salt); void get_salt_from_password_323(unsigned long *res, const char *password); +#if MYSQL_VERSION_ID < 100100 void make_password_from_salt_323(char *to, const unsigned long *salt); - +#endif void make_scrambled_password(char *to, const char *password); void scramble(char *to, const char *message, const char *password); my_bool check_scramble(const unsigned char *reply, const char *message, const unsigned char *hash_stage2); void get_salt_from_password(unsigned char *res, const char *password); +#if MYSQL_VERSION_ID < 100100 void make_password_from_salt(char *to, const unsigned char *hash_stage2); +#endif char *octet2hex(char *to, const char *str, unsigned int len); /* end of password.c */ |