diff options
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 021d771cef1..df19c6e55fd 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -2733,7 +2733,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) { @@ -2939,7 +2940,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) { @@ -3065,7 +3067,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) { |