summaryrefslogtreecommitdiff
path: root/sql/sql_acl.h
diff options
context:
space:
mode:
authorsachin <sachin.setiya@maridb.com>2018-05-15 14:01:24 +0530
committersachin <sachin.setiya@mariadb.com>2018-05-18 08:22:41 +0530
commit395c8ca708c15e7f4b8dca5c3f5246d03eb557af (patch)
tree67debb9d344feff4faac2ee3e74c2b396bc7fc8b /sql/sql_acl.h
parentff0e9b2fce0eac1eb0814bd854f9a01aa3d35461 (diff)
downloadmariadb-git-395c8ca708c15e7f4b8dca5c3f5246d03eb557af.tar.gz
MDEV-14853 Grant does not work correctly when table contains...
SYSTEM_INVISIBLE or COMPLETELY_INVISIBLE This commit does multiple things to solve this mdev 1st add field into the parameter of check_column_grant_in_table_ref, so that we can find out field invisibility. 2nd If field->invisible >= INVISIBLE_SYSTEM skip access check and simple grant access.
Diffstat (limited to 'sql/sql_acl.h')
-rw-r--r--sql/sql_acl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h
index a608ef0dd77..6da7d4d5db4 100644
--- a/sql/sql_acl.h
+++ b/sql/sql_acl.h
@@ -239,7 +239,7 @@ bool check_grant_column (THD *thd, GRANT_INFO *grant,
const char *db_name, const char *table_name,
const char *name, size_t length, Security_context *sctx);
bool check_column_grant_in_table_ref(THD *thd, TABLE_LIST * table_ref,
- const char *name, size_t length);
+ const char *name, size_t length, Field *fld);
bool check_grant_all_columns(THD *thd, ulong want_access,
Field_iterator_table_ref *fields);
bool check_grant_routine(THD *thd, ulong want_access,