diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2011-12-07 19:21:51 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2011-12-07 19:21:51 +0400 |
| commit | a1b4eadf89a3940b80a6ed0eadd15ba456c2fa7a (patch) | |
| tree | 8664c11cf07a219d231a375fdb7e8b464ae1408d /sql/opt_subselect.cc | |
| parent | 8e25dcfcd7bc1ccf9d65b2f12eba4543ed1bf9f4 (diff) | |
| download | mariadb-git-a1b4eadf89a3940b80a6ed0eadd15ba456c2fa7a.tar.gz | |
BUG#868908: Crash in check_simple_equality() with semijoin + materialization + prepared statement
- Part2: safety and code cleanup
Diffstat (limited to 'sql/opt_subselect.cc')
| -rw-r--r-- | sql/opt_subselect.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index 178d0bac3d3..82309c8cece 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -1431,21 +1431,11 @@ static bool convert_subq_to_jtbm(JOIN *parent_join, DBUG_ENTER("convert_subq_to_jtbm"); bool optimization_delayed= TRUE; subq_pred->set_strategy(SUBS_MATERIALIZATION); -// if (subq_pred->optimize(&rows, &read_time)) psergey-fix -// DBUG_RETURN(TRUE); subq_pred->jtbm_read_time= read_time; subq_pred->jtbm_record_count=rows; subq_pred->is_jtbm_merged= TRUE; -/* psergey-fix - if (subq_pred->engine->engine_type() != subselect_engine::HASH_SJ_ENGINE) - { - *remove_item= FALSE; - DBUG_RETURN(FALSE); - } -*/ - *remove_item= TRUE; TABLE_LIST *jtbm; |