diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-09-03 10:57:02 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-09-03 10:57:02 +0200 |
| commit | b9bc3c24630980b260b91fc856689dbad336064e (patch) | |
| tree | 63c6339feb795a0419540f6c63c41ff58a0ffd2d /sql/table.h | |
| parent | b3c320bb0b93e516cda4db277cfa3efeef48c988 (diff) | |
| parent | 43c393ff4732e9ea8719864abeb73cefd5b528a9 (diff) | |
| download | mariadb-git-b9bc3c24630980b260b91fc856689dbad336064e.tar.gz | |
Merge branch '5.5' into 10.0bb-10.0-merge-sanja
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sql/table.h b/sql/table.h index 73c40992751..05596b605a5 100644 --- a/sql/table.h +++ b/sql/table.h @@ -2283,6 +2283,16 @@ struct TABLE_LIST } void set_lock_type(THD* thd, enum thr_lock_type lock); + void remove_join_columns() + { + if (join_columns) + { + join_columns->empty(); + join_columns= NULL; + is_join_columns_complete= FALSE; + } + } + private: bool prep_check_option(THD *thd, uint8 check_opt_type); bool prep_where(THD *thd, Item **conds, bool no_where_clause); |