diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2008-03-27 23:34:12 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2008-03-27 23:34:12 +0100 |
| commit | ea4c84eadafd4673165232d01d811a6a7c5ddf9f (patch) | |
| tree | 432acab1ed6fe07e9087cf7577c8910fcfbb6900 /sql/sql_acl.cc | |
| parent | 099c888967557c164e11cb0ca7d895898be6edc9 (diff) | |
| parent | 1561ee5c56875a2d136170a357167700d62f0a01 (diff) | |
| download | mariadb-git-ea4c84eadafd4673165232d01d811a6a7c5ddf9f.tar.gz | |
Merge mysql.com:/misc/mysql/mysql-5.1
into mysql.com:/misc/mysql/mysql-5.1-opt
CMakeLists.txt:
Auto merged
configure.in:
Auto merged
include/config-win.h:
Auto merged
include/my_global.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_db.cc:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index e20dc71e6cb..92eb68dc2fa 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -1521,7 +1521,7 @@ bool acl_check_host(const char *host, const char *ip) 1 ERROR ; In this case the error is sent to the client. */ -bool check_change_password(THD *thd, const char *host, const char *user, +int check_change_password(THD *thd, const char *host, const char *user, char *new_password, uint new_password_len) { if (!initialized) @@ -2923,7 +2923,7 @@ table_error: TRUE error */ -bool mysql_table_grant(THD *thd, TABLE_LIST *table_list, +int mysql_table_grant(THD *thd, TABLE_LIST *table_list, List <LEX_USER> &user_list, List <LEX_COLUMN> &columns, ulong rights, bool revoke_grant) @@ -6148,7 +6148,7 @@ bool sp_revoke_privileges(THD *thd, const char *sp_db, const char *sp_name, < 0 Error. Error message not yet sent. */ -bool sp_grant_privileges(THD *thd, const char *sp_db, const char *sp_name, +int sp_grant_privileges(THD *thd, const char *sp_db, const char *sp_name, bool is_proc) { Security_context *sctx= thd->security_ctx; |