mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-26 10:15:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge to get security patch

Browse source 
BitKeeper/etc/logging_ok:
  auto-union
sql/sql_acl.cc:
  Auto merged
tests/grant.pl:
  Auto merged
tests/grant.res:
  Auto merged
BitKeeper/triggers/post-commit:
  use local file
client/mysqldump.c:
  Merge to get crash fix
This commit is contained in:
unknown 2003-05-08 00:12:46 +03:00
commit 97eef79b02
6 changed files with 50 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
sql/sql_acl.cc
View file

@ -2520,8 +2520,8 @@ bool check_grant(THD *thd, ulong want_access, TABLE_LIST *tables,
}
bool check_grant_column (THD *thd,TABLE *table, const char *name,
uint length, uint show_tables)
bool check_grant_column(THD *thd,TABLE *table, const char *name,
uint length, uint show_tables)
{
GRANT_TABLE *grant_table;
GRANT_COLUMN *grant_column;
@ -2529,6 +2529,8 @@ bool check_grant_column (THD *thd,TABLE *table, const char *name,
ulong want_access=table->grant.want_privilege;
if (!want_access)
return 0; // Already checked
if (!grant_option)
goto err2;
pthread_mutex_lock(&LOCK_grant);
@ -2560,8 +2562,9 @@ bool check_grant_column (THD *thd,TABLE *table, const char *name,
#endif
/* We must use my_printf_error() here! */
err:
err:
pthread_mutex_unlock(&LOCK_grant);
err2:
if (!show_tables)
{
char command[128];