diff options
| author | unknown <monty@mysql.com> | 2005-03-29 12:37:36 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-03-29 12:37:36 +0300 |
| commit | 51690eca7e933f9e4164ec628b8b10419a089711 (patch) | |
| tree | fbaeb086fef12b0ff1fe5346161fa28b308a647e /sql/sql_acl.cc | |
| parent | fa4a075b6cb7ba7e71c842e6649bf7e7c516bef2 (diff) | |
| download | mariadb-git-51690eca7e933f9e4164ec628b8b10419a089711.tar.gz | |
Cleanups during review
ndb/src/ndbapi/DictCache.cpp:
Simpler bit handling code
sql/sql_acl.cc:
Fix for bool parameter
sql/sql_yacc.yy:
Removed compiler warning
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 0a5939428cd..c98c22c3b91 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -2729,7 +2729,8 @@ bool mysql_table_grant(THD *thd, TABLE_LIST *table_list, pthread_mutex_lock(&acl_cache->lock); error=replace_user_table(thd, tables[0].table, *Str, 0, revoke_grant, create_new_users, - thd->variables.sql_mode & MODE_NO_AUTO_CREATE_USER); + test(thd->variables.sql_mode & + MODE_NO_AUTO_CREATE_USER)); pthread_mutex_unlock(&acl_cache->lock); if (error) { @@ -2935,7 +2936,8 @@ bool mysql_procedure_grant(THD *thd, TABLE_LIST *table_list, pthread_mutex_lock(&acl_cache->lock); error=replace_user_table(thd, tables[0].table, *Str, 0, revoke_grant, create_new_users, - thd->variables.sql_mode & MODE_NO_AUTO_CREATE_USER); + test(thd->variables.sql_mode & + MODE_NO_AUTO_CREATE_USER)); pthread_mutex_unlock(&acl_cache->lock); if (error) { @@ -3061,7 +3063,8 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list, } if (replace_user_table(thd, tables[0].table, *Str, (!db ? rights : 0), revoke_grant, create_new_users, - thd->variables.sql_mode & MODE_NO_AUTO_CREATE_USER)) + test(thd->variables.sql_mode & + MODE_NO_AUTO_CREATE_USER))) result= -1; else if (db) { |