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

Correction for the patch for mdev-11102.

Browse Source
This commit is contained in:
Igor Babaev
2016-11-16 15:06:19 -08:00
parent 1655160ddc
commit ebe5a38e16
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/sql_select.cc
View File

@@ -1281,11 +1281,17 @@ JOIN::optimize_inner()
Do not push conditions from where into materialized inner tables Do not push conditions from where into materialized inner tables
of outer joins: this is not valid. of outer joins: this is not valid.
*/ */
if (tbl->is_materialized_derived() && if (tbl->is_materialized_derived())
!tbl->is_inner_table_of_outer_join())
{ {
if (pushdown_cond_for_derived(thd, conds, tbl)) /*
DBUG_RETURN(1); Do not push conditions from where into materialized inner tables
of outer joins: this is not valid.
*/
if (!tbl->is_inner_table_of_outer_join())
{
if (pushdown_cond_for_derived(thd, conds, tbl))
DBUG_RETURN(1);
}
if (mysql_handle_single_derived(thd->lex, tbl, DT_OPTIMIZE)) if (mysql_handle_single_derived(thd->lex, tbl, DT_OPTIMIZE))
DBUG_RETURN(1); DBUG_RETURN(1);
} }