database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge

Browse Source 
Docs/manual.texi:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/mysqld.cc:
  merge
sql/net_serv.cc:
  SCCS merged
This commit is contained in:
unknown
2001-09-15 15:19:47 +02:00
parent e0e42a7918 45ea63fec3
commit 3c360e3ea5
4 changed files with 170 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_acl.cc
View File

@ -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