diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-18 16:46:57 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-18 16:46:57 +0200 |
| commit | 5f6380adde2dac3f32b40339b9b702c0135eb7d6 (patch) | |
| tree | 31068acc0b39c208d35d524688a5985831af0447 /sql/sql_select.h | |
| parent | 8a23ae088dc38f591efeab9eccdef5eb9094add9 (diff) | |
| parent | 97e640b9ae83e07b444fceede6b0524256c7a3cc (diff) | |
| download | mariadb-git-5f6380adde2dac3f32b40339b9b702c0135eb7d6.tar.gz | |
10.0-base merge
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index d1f11b8ae71..9ff08a3bc03 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -1319,6 +1319,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, @@ -1836,11 +1842,12 @@ void free_tmp_table(THD *thd, TABLE *entry); bool create_internal_tmp_table_from_heap(THD *thd, TABLE *table, TMP_ENGINE_COLUMNDEF *start_recinfo, TMP_ENGINE_COLUMNDEF **recinfo, - int error, bool ignore_last_dupp_key_error); + int error, bool ignore_last_dupp_key_error, + bool *is_duplicate); bool create_internal_tmp_table(TABLE *table, KEY *keyinfo, TMP_ENGINE_COLUMNDEF *start_recinfo, TMP_ENGINE_COLUMNDEF **recinfo, - ulonglong options, my_bool big_tables); + ulonglong options); bool open_tmp_table(TABLE *table); void setup_tmp_table_column_bitmaps(TABLE *table, uchar *bitmaps); double prev_record_reads(POSITION *positions, uint idx, table_map found_ref); |