diff options
| author | unknown <gkodinov@mysql.com> | 2006-05-26 11:51:30 +0300 |
|---|---|---|
| committer | unknown <gkodinov@mysql.com> | 2006-05-26 11:51:30 +0300 |
| commit | 6386c5dfc089aa4da506201ce517a5d1340f2926 (patch) | |
| tree | 248245bc4fdd9c6ffe0cdad5bb482d4bfc07add7 /sql/mysql_priv.h | |
| parent | 779b09b71ebaddcfc686f8f9681d79f688d0bffd (diff) | |
| parent | d7743c41c6cc559c556f435cd7cdd359bd035c09 (diff) | |
| download | mariadb-git-6386c5dfc089aa4da506201ce517a5d1340f2926.tar.gz | |
Merge mysql.com:/home/kgeorge/mysql/5.0/clean
into mysql.com:/home/kgeorge/mysql/5.0/B18681
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index f300c72c4ac..6d39f2f7440 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -947,6 +947,13 @@ bool insert_fields(THD *thd, Name_resolution_context *context, bool setup_tables(THD *thd, Name_resolution_context *context, List<TABLE_LIST> *from_clause, TABLE_LIST *tables, Item **conds, TABLE_LIST **leaves, bool select_insert); +bool setup_tables_and_check_access (THD *thd, + Name_resolution_context *context, + List<TABLE_LIST> *from_clause, + TABLE_LIST *tables, Item **conds, + TABLE_LIST **leaves, + bool select_insert, + ulong want_access); int setup_wild(THD *thd, TABLE_LIST *tables, List<Item> &fields, List<Item> *sum_func_list, uint wild_num); bool setup_fields(THD *thd, Item** ref_pointer_array, |