summaryrefslogtreecommitdiff
path: root/sql/password.c
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-03-06 19:34:22 +0100
committerSergei Golubchik <serg@mariadb.org>2017-03-10 18:21:27 +0100
commit0877eff4012ab1184112814a3492d23bf266f848 (patch)
tree1b34a6bbbd9c1e2d505a0806b85bdc521620083a /sql/password.c
parent6305533de2fd38d43c149d4d7c847f65d68205c7 (diff)
downloadmariadb-git-0877eff4012ab1184112814a3492d23bf266f848.tar.gz
thd_rnd service
Diffstat (limited to 'sql/password.c')
-rw-r--r--sql/password.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/password.c b/sql/password.c
index 8d05f7d2375..02e4a0c37c7 100644
--- a/sql/password.c
+++ b/sql/password.c
@@ -38,7 +38,7 @@
The new authentication is performed in following manner:
- SERVER: public_seed=create_random_string()
+ SERVER: public_seed=thd_create_random_password()
send(public_seed)
CLIENT: recv(public_seed)
@@ -278,6 +278,7 @@ void make_password_from_salt_323(char *to, const ulong *salt)
**************** MySQL 4.1.1 authentication routines *************
*/
+#if MYSQL_VERSION_ID < 0x100200
/**
Generate string of printable random characters of requested length.
@@ -296,6 +297,9 @@ void create_random_string(char *to, uint length,
*to= (char) (my_rnd(rand_st)*94+33);
*to= '\0';
}
+#else
+#error
+#endif
/* Character to use as version identifier for version 4.1 */