database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

WL#5030: Splitting mysql_priv.h

Browse Source 
Adding my_global.h first in all files using
NO_EMBEDDED_ACCESS_CHECKS.

Correcting a merge problem resulting from a changed definition
of check_some_access compared to the original patches.
This commit is contained in:
Mats Kindahl
2010-04-07 13:58:40 +02:00
parent e92b3c587c
commit 46bd78b9ee
28 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_parse.h
View File

@ -16,6 +16,7 @@
#ifndef SQL_PARSE_INCLUDED
#define SQL_PARSE_INCLUDED
#include "my_global.h" /* NO_EMBEDDED_ACCESS_CHECKS */
#include "sql_acl.h" /* GLOBAL_ACLS */
class Comp_creator;
@ -177,7 +178,10 @@ inline bool check_routine_access(THD *thd,ulong want_access,char *db,
char *name, bool is_proc, bool no_errors)
{ return false; }
inline bool check_some_access(THD *thd, ulong want_access, TABLE_LIST *table)
{ return false; }
{
table->grant.privilege= want_access;
return false;
}
inline bool check_merge_table_access(THD *thd, char *db, TABLE_LIST *table_list)
{ return false; }
inline bool check_some_routine_access(THD *thd, const char *db,