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

Updates for release

Browse Source 
BitKeeper/deleted/.del-mi_debug.c:
  ***MISSING WEAVE***
BUILD/compile-alpha-ccc:
  Added thread safe libraries
Docs/manual.texi:
  Added information about --log-slow-queries
Makefile.am:
  Fix for thread safe libraries
client/mysql.cc:
  Allow commands without ; on first line
myisam/Makefile.am:
  Removed mi_debug.c
myisam/mi_check.c:
  Removed compiler warnings
myisam/mi_dbug.c:
  Extra debugging
myisammrg/myrg_rkey.c:
  Removed compiler warnings
myisammrg/myrg_rnext.c:
  Removed compiler warnings
myisammrg/myrg_rprev.c:
  Removed compiler warnings
sql/mini_client.cc:
  Removed compiler warnings
sql/mysqld.cc:
  Updated help
sql/sql_parse.cc:
  Fix permission checking for RENAME
tests/grant.pl:
  Added more grant tests
tests/grant.res:
  New results
This commit is contained in:
unknown
2000-08-29 19:38:32 +03:00
parent 3776743da2
commit 463016ee27
16 changed files with 260 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_parse.cc
View File

@ -1137,16 +1137,21 @@ mysql_execute_command(void)
goto error;
for (table=tables ; table ; table=table->next->next)
{
if (check_access(thd, ALTER_ACL, table->db, &table->grant.privilege) ||
if (check_access(thd, ALTER_ACL | DROP_ACL, table->db,
&table->grant.privilege) ||
check_access(thd, INSERT_ACL | CREATE_ACL, table->next->db,
&table->next->grant.privilege))
goto error;
if (grant_option)
{
if (check_grant(thd,ALTER_ACL,table) ||
TABLE_LIST old_list,new_list;
old_list=table[0];
new_list=table->next[0];
old_list.next=new_list.next=0;
if (check_grant(thd,ALTER_ACL,&old_list) ||
(!test_all_bits(table->next->grant.privilege,
INSERT_ACL | CREATE_ACL) &&
check_grant(thd,INSERT_ACL | CREATE_ACL, table->next)))
check_grant(thd,INSERT_ACL | CREATE_ACL, &new_list)))
goto error;
}
}