diff options
| author | unknown <serg@serg.mylan> | 2005-01-24 19:41:42 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-01-24 19:41:42 +0100 |
| commit | a82fd1eaec9067bbed9cceb9294734a8d09b72da (patch) | |
| tree | 0c73a61f5c88d003eae464001af7656745e9ba4e /sql/sql_acl.h | |
| parent | 7eb825a07280dfeb1bae3def25a3bc0add544a74 (diff) | |
| parent | 7109999b92ec8541a61ca5babc5b06f4315478a8 (diff) | |
| download | mariadb-git-a82fd1eaec9067bbed9cceb9294734a8d09b72da.tar.gz | |
merged
BitKeeper/deleted/.del-sort.c~e2e56b5a37ce86f4:
Auto merged
client/mysql.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
myisam/mi_packrec.c:
Auto merged
myisam/sort.c:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/tztime.cc:
Auto merged
tests/client_test.c:
Auto merged
Diffstat (limited to 'sql/sql_acl.h')
| -rw-r--r-- | sql/sql_acl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h index b129ffcdcf8..3a9df84a35d 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -176,7 +176,7 @@ int acl_getroot(THD *thd, USER_RESOURCES *mqh, const char *passwd, int acl_getroot_no_password(THD *thd); bool acl_check_host(const char *host, const char *ip); bool check_change_password(THD *thd, const char *host, const char *user, - char *password); + char *password, uint password_len); bool change_password(THD *thd, const char *host, const char *user, char *password); bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &user_list, |