diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-12-09 12:38:02 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-12-09 12:38:02 +0100 |
commit | bec1d903d944acd5c28c3f4f2d22b84ddae63ea2 (patch) | |
tree | 8a903859333de1648f789a2985fd62e856ebfa05 /include/password.h | |
parent | 6ae5f0efea392e3fdb285afc1bafdae16888b96a (diff) | |
download | mariadb-git-bec1d903d944acd5c28c3f4f2d22b84ddae63ea2.tar.gz |
Do the partial merge of WL#5602 correctly:
Remove unused code (that should not have been merged)
Add protocol extension (that should have been merged)
Fix bugs (see pack.c)
Diffstat (limited to 'include/password.h')
-rw-r--r-- | include/password.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/password.h b/include/password.h index 5dfea533546..082f917e7c0 100644 --- a/include/password.h +++ b/include/password.h @@ -24,8 +24,6 @@ void my_make_scrambled_password_323(char *to, const char *password, size_t pass_len); void my_make_scrambled_password(char *to, const char *password, size_t pass_len); -void my_make_scrambled_password_sha1(char *to, const char *password, - size_t pass_len); void hash_password(ulong *result, const char *password, uint password_len); |