diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2013-07-15 18:51:52 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2013-07-15 18:51:52 +0400 |
| commit | 716a49a19e9a6fdd86f384917c8fdd6fdd0dd53f (patch) | |
| tree | 525ec219024dc4f0a4acd96c3a3dee5245e21c44 /sql/sql_select.h | |
| parent | e8b0b51966ae8b112c61650814af78530e8e7624 (diff) | |
| download | mariadb-git-716a49a19e9a6fdd86f384917c8fdd6fdd0dd53f.tar.gz | |
MDEV-4536, MDEV-4042
- Make JOIN::cleanup(true) also work correctly when the query is KILLed
after join optimization was started but before a query plan was produced
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index 47e5f0537b8..7168fd54024 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -1308,6 +1308,12 @@ public: pre_sort_join_tab= NULL; emb_sjm_nest= NULL; sjm_lookup_tables= 0; + /* + The following is needed because JOIN::cleanup(true) may be called for + joins for which JOIN::optimize was aborted with an error before a proper + query plan was produced + */ + table_access_tabs= NULL; } int prepare(Item ***rref_pointer_array, TABLE_LIST *tables, uint wind_num, |