diff options
| author | unknown <monty@work.mysql.com> | 2001-09-15 15:19:47 +0200 |
|---|---|---|
| committer | unknown <monty@work.mysql.com> | 2001-09-15 15:19:47 +0200 |
| commit | 3c360e3ea510c916d0ebda3fbcded31d010d6e6d (patch) | |
| tree | 83fa71f32774bec4b46239a2dc3f170172a10b86 /sql/sql_acl.cc | |
| parent | e0e42a791802ae58437d1a40944ec33e1fd81afc (diff) | |
| parent | 45ea63fec3b9cf740c363508730bb2ce63de719a (diff) | |
| download | mariadb-git-3c360e3ea510c916d0ebda3fbcded31d010d6e6d.tar.gz | |
Merge
Docs/manual.texi:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/mysqld.cc:
merge
sql/net_serv.cc:
SCCS merged
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index bc2222ffa48..4c128a882c6 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -1624,6 +1624,7 @@ int mysql_table_grant (THD *thd, TABLE_LIST *table_list, List_iterator <LEX_USER> str_list (user_list); LEX_USER *Str; TABLE_LIST tables[3]; + bool create_new_users=0; DBUG_ENTER("mysql_table_grant"); if (!initialized) @@ -1691,6 +1692,8 @@ int mysql_table_grant (THD *thd, TABLE_LIST *table_list, DBUG_RETURN(-1); /* purecov: deadcode */ } + if (!revoke_grant) + create_new_users= test_if_create_new_users(thd); int result=0; pthread_mutex_lock(&LOCK_grant); MEM_ROOT *old_root=my_pthread_getspecific_ptr(MEM_ROOT*,THR_MALLOC); @@ -1716,8 +1719,7 @@ int mysql_table_grant (THD *thd, TABLE_LIST *table_list, *Str, 0, revoke_grant ? 'N' : 'Y', - (revoke_grant ? 0 : - test_if_create_new_users(thd)))) + create_new_users)) { result= -1; // Remember error continue; // Add next user |