diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-17 08:42:53 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-17 08:42:53 +0300 |
| commit | 4c7608aeb187383f2629e96e085b5b50fc81337f (patch) | |
| tree | fc8dce68b02a63ca204203034dae81a7162a4b9f /sql/sql_base.h | |
| parent | c2352c45fbd670f50b73415eeeb676aa67fb4a29 (diff) | |
| parent | a4e7800701d0764fe4cbb85b81d7c7cb54677334 (diff) | |
| download | mariadb-git-4c7608aeb187383f2629e96e085b5b50fc81337f.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_base.h')
| -rw-r--r-- | sql/sql_base.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_base.h b/sql/sql_base.h index 645a4a83fcb..b85e01032fa 100644 --- a/sql/sql_base.h +++ b/sql/sql_base.h @@ -155,11 +155,12 @@ bool fill_record_n_invoke_before_triggers(THD *thd, TABLE *table, enum trg_event_type event); bool insert_fields(THD *thd, Name_resolution_context *context, const char *db_name, const char *table_name, - List_iterator<Item> *it, bool any_privileges); + List_iterator<Item> *it, bool any_privileges, + uint *hidden_bit_fields); void make_leaves_list(THD *thd, List<TABLE_LIST> &list, TABLE_LIST *tables, bool full_table_list, TABLE_LIST *boundary); int setup_wild(THD *thd, TABLE_LIST *tables, List<Item> &fields, - List<Item> *sum_func_list, uint wild_num); + List<Item> *sum_func_list, uint wild_num, uint * hidden_bit_fields); bool setup_fields(THD *thd, Ref_ptr_array ref_pointer_array, List<Item> &item, enum_column_usage column_usage, List<Item> *sum_func_list, List<Item> *pre_fix, |