diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2017-03-14 11:52:00 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2017-03-14 11:52:00 +0100 |
| commit | 05d3c3d3f748f74bbd12924d090f882c5c928249 (patch) | |
| tree | d15b528bced3ab5b1ce86ea0569eeba2efe67115 /sql/table.h | |
| parent | e43156e1a679c95413aab2c4bf9523da7947fc18 (diff) | |
| download | mariadb-git-05d3c3d3f748f74bbd12924d090f882c5c928249.tar.gz | |
MDEV-10141: Add support for INTERSECT (and common parts for EXCEPT)
MDEV-10140: Add support for EXCEPT
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/table.h b/sql/table.h index c1f2c5feebe..a94fcef2316 100644 --- a/sql/table.h +++ b/sql/table.h @@ -1303,7 +1303,7 @@ public: void init(THD *thd, TABLE_LIST *tl); bool fill_item_list(List<Item> *item_list) const; - void reset_item_list(List<Item> *item_list) const; + void reset_item_list(List<Item> *item_list, uint skip) const; void clear_column_bitmaps(void); void prepare_for_position(void); MY_BITMAP *prepare_for_keyread(uint index, MY_BITMAP *map); @@ -1635,7 +1635,7 @@ class IS_table_read_plan; /** The threshold size a blob field buffer before it is freed */ #define MAX_TDC_BLOB_SIZE 65536 -class select_union; +class select_unit; class TMP_TABLE_PARAM; Item *create_view_field(THD *thd, TABLE_LIST *view, Item **field_ref, @@ -1868,7 +1868,7 @@ struct TABLE_LIST select_result for derived table to pass it from table creation to table filling procedure */ - select_union *derived_result; + select_unit *derived_result; /* Stub used for materialized derived tables. */ table_map map; /* ID bit of table (1,2,4,8,16...) */ table_map get_map() |