summaryrefslogtreecommitdiff
path: root/sql/table.h
diff options
context:
space:
mode:
authorunknown <timour@mysql.com>2005-11-30 21:27:11 +0200
committerunknown <timour@mysql.com>2005-11-30 21:27:11 +0200
commite486fe1ff18796792fac56ca5425733fb0f68692 (patch)
tree7bdffd4813f1f558ecae86cf758e9b8b55b92895 /sql/table.h
parent4fd41f7c0bd7e61265e219aecada2e7b36df88c3 (diff)
downloadmariadb-git-e486fe1ff18796792fac56ca5425733fb0f68692.tar.gz
WL#2486 - natural/using joins according to SQL:2003
Post-review fixes that simplify the way access rights are checked during name resolution and factor out all entry points to check access rights into one single function. sql/item.cc: Simplfied find_field_in_table - factored out all acces right checks into a separate function. sql/mysql_priv.h: Simplified the way we control whether to perform access right checks for columns. sql/sql_acl.cc: - Added new functon check_column_grant_in_table_ref that serves as a single point of entry to check access rights during name resolution for different kinds of table references. - Moved check_grant_column_in_sctx to sql_acl.cc where it logically belongs. - Removed the parameter check_grants - it is checked before calling the function. sql/sql_acl.h: - Added new function check_column_grant_in_table_ref. - Made check_grant_column_in_sctx available to other modules. sql/sql_base.cc: - Factored out all code that check access rights for columns during name resolution into one function - check_column_grant_in_table_ref. - Moved check_grant_column_in_sctx to sql_acl.cc where it logically belongs. - Removed the parameter check_grants - it is checked before calling the function. sql/table.cc: Removed code that duplicates the functionality of check_column_grant_in_table_ref, and called directly that function. sql/table.h: check_grants method is replaced by more general check_column_grant_in_table_ref.
Diffstat (limited to 'sql/table.h')
-rw-r--r--sql/table.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/table.h b/sql/table.h
index e6c9ab4de87..ce0616a6833 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -407,9 +407,6 @@ public:
const char *table_name();
const char *db_name();
GRANT_INFO *grant();
-#ifndef NO_EMBEDDED_ACCESS_CHECKS
- bool check_grants(THD *thd, const char *name, uint length);
-#endif
};