database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge mysql.com:/home/timka/mysql/src/5.0-2486

Browse Source 
into  mysql.com:/home/timka/mysql/src/5.1-dbg
This commit is contained in:
timour@mysql.com
2005-12-07 10:47:43 +02:00
parent 548bacf41b ecb41e28f2
commit 3d01a3affc
14 changed files with 296 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_acl.h
View File

@@ -205,7 +205,9 @@ bool check_grant(THD *thd, ulong want_access, TABLE_LIST *tables,
uint show_command, uint number, bool dont_print_error);
bool check_grant_column (THD *thd, GRANT_INFO *grant,
const char *db_name, const char *table_name,
const char *name, uint length, uint show_command=0);
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);