mirror of
https://github.com/MariaDB/server.git
synced 2026-04-27 18:55:31 +02:00
merged the fix for bug 30468 to 5.1-opt
mysql-test/t/grant2.test: Auto merged sql/sql_acl.h: Auto merged sql/sql_base.cc: Auto merged
This commit is contained in:
commit
2e57478d92
6 changed files with 111 additions and 38 deletions
|
|
@ -244,9 +244,8 @@ bool check_grant_column (THD *thd, GRANT_INFO *grant,
|
|||
const char *name, uint length, Security_context *sctx);
|
||||
bool check_column_grant_in_table_ref(THD *thd, TABLE_LIST * table_ref,
|
||||
const char *name, uint length);
|
||||
bool check_grant_all_columns(THD *thd, ulong want_access, GRANT_INFO *grant,
|
||||
const char* db_name, const char *table_name,
|
||||
Field_iterator *fields);
|
||||
bool check_grant_all_columns(THD *thd, ulong want_access,
|
||||
Field_iterator_table_ref *fields);
|
||||
bool check_grant_routine(THD *thd, ulong want_access,
|
||||
TABLE_LIST *procs, bool is_proc, bool no_error);
|
||||
bool check_grant_db(THD *thd,const char *db);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue