diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-08-18 13:29:04 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-08-18 13:29:04 +0200 |
| commit | eb498cce4dafc2eda285c71ed96d64e451f02ec2 (patch) | |
| tree | b38d061771d52ab55fe9d428e45627d4c08d5f63 /sql/sql_parse.h | |
| parent | 6293c44ff6debb4f617260df727b281e77a41b5c (diff) | |
| parent | e28d6ee66a8404dd0f8fe3aaabb9d72544e5d42e (diff) | |
| download | mariadb-git-eb498cce4dafc2eda285c71ed96d64e451f02ec2.tar.gz | |
Manual merge from mysql-5.5-bugfixing to mysql-5.5-runtime.
Diffstat (limited to 'sql/sql_parse.h')
| -rw-r--r-- | sql/sql_parse.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_parse.h b/sql/sql_parse.h index fe7fbd9482e..ad620544d29 100644 --- a/sql/sql_parse.h +++ b/sql/sql_parse.h @@ -153,6 +153,7 @@ bool check_single_table_access(THD *thd, ulong privilege, bool check_routine_access(THD *thd,ulong want_access,char *db,char *name, bool is_proc, bool no_errors); bool check_some_access(THD *thd, ulong want_access, TABLE_LIST *table); +bool check_merge_table_access(THD *thd, char *db, TABLE_LIST *table_list); bool check_some_routine_access(THD *thd, const char *db, const char *name, bool is_proc); bool check_access(THD *thd, ulong want_access, const char *db, ulong *save_priv, GRANT_INTERNAL_INFO *grant_internal_info, |