diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-04-10 01:14:32 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-04-10 01:14:32 +0300 |
| commit | 8ab58393c5c9732c032faac3f0d04a4536e5562b (patch) | |
| tree | 9b43a6ee50851ff9a0c1df227464a4eb032802e2 /sql/sql_acl.h | |
| parent | 2384ed8c011a6df7091bb758e500cca89c499c7e (diff) | |
| download | mariadb-git-8ab58393c5c9732c032faac3f0d04a4536e5562b.tar.gz | |
after review PS fixes
sql/item_cmpfunc.cc:
merged in one if
sql/mysql_priv.h:
removed unused paremeter of check_one_table_access
declaration of new function for SP share code
sql/set_var.cc:
function descriotion added
unneeded parantses removed
sql/sql_acl.cc:
new parameter to limit number of checked tables for check_grant
sql/sql_acl.h:
new parameter to limit number of checked tables for check_grant
sql/sql_delete.cc:
preparation moved in separate function
sql/sql_insert.cc:
preparation moved in separate function
sql/sql_lex.cc:
comment style fixed
unneeded assignment removed
sql/sql_parse.cc:
new parameter to limit number of checked tables for check_grant
table list manipulation removed (because of above)
new precheck function
sql/sql_prepare.cc:
function rewrited to shere code with sql_prepare.cc
flow control fixed
sql/sql_show.cc:
new parameter to limit number of checked tables for check_grant
sql/sql_update.cc:
preparation moved in separate function
sql/table.h:
flag renamed
Diffstat (limited to 'sql/sql_acl.h')
| -rw-r--r-- | sql/sql_acl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_acl.h b/sql/sql_acl.h index 4b911b44f77..a237b45e29c 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -154,7 +154,7 @@ my_bool grant_init(THD *thd); void grant_free(void); void grant_reload(THD *thd); bool check_grant(THD *thd, ulong want_access, TABLE_LIST *tables, - uint show_command, bool dont_print_error); + uint show_command, uint number, bool dont_print_error); bool check_grant_column (THD *thd,TABLE *table, const char *name, uint length, uint show_command=0); bool check_grant_all_columns(THD *thd, ulong want_access, TABLE *table); @@ -168,6 +168,6 @@ int mysql_drop_user(THD *thd, List <LEX_USER> &list); int mysql_revoke_all(THD *thd, List <LEX_USER> &list); #ifdef NO_EMBEDDED_ACCESS_CHECKS -#define check_grant(A,B,C,D,E) 0 +#define check_grant(A,B,C,D,E,F) 0 #define check_grant_db(A,B) 0 #endif |