database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

BUG#868908: Crash in check_simple_equality() with semijoin + materialization + prepared statement

Browse Source 
- Part2: safety and code cleanup
This commit is contained in:
Sergey Petrunya
2011-12-07 19:21:51 +04:00
parent 8e25dcfcd7
commit a1b4eadf89
5 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/opt_subselect.cc
View File

@@ -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;