summaryrefslogtreecommitdiff
path: root/sql/sql_acl.h
diff options
context:
space:
mode:
authorpeter@mysql.com <>2002-11-24 17:07:53 +0300
committerpeter@mysql.com <>2002-11-24 17:07:53 +0300
commit35ccfd0b4271336049e06e130fbfa1086ba51945 (patch)
treedb7cb82e2166048d043214a331a5ad63bc7d0621 /sql/sql_acl.h
parent961317599eb1ca18547e2a6fa6c1174c6e546ab8 (diff)
downloadmariadb-git-35ccfd0b4271336049e06e130fbfa1086ba51945.tar.gz
SCRUM: Main change for Secure connection handling. Still needs some more coding. Commit
done for merge with newer version of code.
Diffstat (limited to 'sql/sql_acl.h')
-rw-r--r--sql/sql_acl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h
index 326a55ddd0c..a62026ef03c 100644
--- a/sql/sql_acl.h
+++ b/sql/sql_acl.h
@@ -88,7 +88,7 @@ ulong acl_get(const char *host, const char *ip, const char *bin_ip,
const char *user, const char *db);
ulong acl_getroot(THD *thd, const char *host, const char *ip, const char *user,
const char *password,const char *scramble,char **priv_user,
- bool old_ver, USER_RESOURCES *max);
+ bool old_ver, USER_RESOURCES *max,char* prepared_scramble, int stage);
bool acl_check_host(const char *host, const char *ip);
bool check_change_password(THD *thd, const char *host, const char *user);
bool change_password(THD *thd, const char *host, const char *user,