diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2011-11-25 23:54:36 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2011-11-25 23:54:36 +0400 |
| commit | 8325848b6ec4189b8339355689060a19d226a92f (patch) | |
| tree | ffa2858bdb5085ea0b9d122964d3da244288bf6c /sql/sql_select.cc | |
| parent | b796833e8da682dbbca38eab5650fc569000dcf7 (diff) | |
| download | mariadb-git-8325848b6ec4189b8339355689060a19d226a92f.tar.gz | |
Subquery code cleanups:
- Make functions that operate on SJ_TMP_TABLE be member functions
- Make Loose_scan_opt data members private
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 11fadf56656..d8c17012196 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -15105,7 +15105,7 @@ sub_select(JOIN *join,JOIN_TAB *join_tab,bool end_of_records) flush_dups_table; flush_dups_table= flush_dups_table->next_flush_table) { - do_sj_reset(flush_dups_table); + flush_dups_table->sj_weedout_delete_rows(); } if (!join_tab->preread_init_done && join_tab->preread_init()) @@ -15321,7 +15321,7 @@ evaluate_join_record(JOIN *join, JOIN_TAB *join_tab, if (join_tab->check_weed_out_table && found) { - int res= do_sj_dups_weedout(join->thd, join_tab->check_weed_out_table); + int res= join_tab->check_weed_out_table->sj_weedout_check_row(join->thd); if (res == -1) DBUG_RETURN(NESTED_LOOP_ERROR); else if (res == 1) @@ -15445,7 +15445,7 @@ evaluate_null_complemented_join_record(JOIN *join, JOIN_TAB *join_tab) */ if (join_tab->check_weed_out_table) { - int res= do_sj_dups_weedout(join->thd, join_tab->check_weed_out_table); + int res= join_tab->check_weed_out_table->sj_weedout_check_row(join->thd); if (res == -1) return NESTED_LOOP_ERROR; else if (res == 1) |