diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2011-11-25 14:28:43 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2011-11-25 14:28:43 +0400 |
| commit | 3a9edc5f77a7e9f95dd03df719254386138793ba (patch) | |
| tree | 3fcd372cf07b68c17d849d3013f58f628dd5b60d /sql/opt_subselect.h | |
| parent | 962bff5dcaa585f041058a7f75b331bc7c6dbc29 (diff) | |
| parent | f84dbf4b205f311f379a8fd0c6dc1f0fd893e073 (diff) | |
| download | mariadb-git-3a9edc5f77a7e9f95dd03df719254386138793ba.tar.gz | |
Merge
Diffstat (limited to 'sql/opt_subselect.h')
| -rw-r--r-- | sql/opt_subselect.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sql/opt_subselect.h b/sql/opt_subselect.h index 823b09a1f73..b5886ae06a2 100644 --- a/sql/opt_subselect.h +++ b/sql/opt_subselect.h @@ -263,8 +263,8 @@ public: { pos->records_read= best_loose_scan_records; pos->key= best_loose_scan_start_key; - pos->loosescan_key= best_loose_scan_key; - pos->loosescan_parts= best_max_loose_keypart + 1; + pos->loosescan_picker.loosescan_key= best_loose_scan_key; + pos->loosescan_picker.loosescan_parts= best_max_loose_keypart + 1; pos->use_join_buffer= FALSE; pos->table= tab; // todo need ref_depend_map ? @@ -277,8 +277,7 @@ public: }; -void advance_sj_state(JOIN *join, const table_map remaining_tables, - const JOIN_TAB *new_join_tab, uint idx, +void advance_sj_state(JOIN *join, const table_map remaining_tables, uint idx, double *current_record_count, double *current_read_time, POSITION *loose_scan_pos); void restore_prev_sj_state(const table_map remaining_tables, @@ -359,8 +358,7 @@ public: ENGINE_COLUMNDEF *start_recinfo; ENGINE_COLUMNDEF *recinfo; - /* Pointer to next table (next->start_idx > this->end_idx) */ - SJ_TMP_TABLE *next; + SJ_TMP_TABLE *next_flush_table; }; int setup_semijoin_dups_elimination(JOIN *join, ulonglong options, |