Skip to content

Commit 9ea0b44

Browse files
committed
Such big blocks in query processing should be represented in the debugging trace.
1 parent 0841325 commit 9ea0b44

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

sql/sql_derived.cc

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,23 +1129,24 @@ bool mysql_derived_reinit(THD *thd, LEX *lex, TABLE_LIST *derived)
11291129

11301130
bool pushdown_cond_for_derived(THD *thd, Item *cond, TABLE_LIST *derived)
11311131
{
1132+
DBUG_ENTER("pushdown_cond_for_derived");
11321133
if (!cond)
1133-
return false;
1134+
DBUG_RETURN(false);
11341135

11351136
st_select_lex_unit *unit= derived->get_unit();
11361137
st_select_lex *sl= unit->first_select();
11371138

11381139
/* Do not push conditions into constant derived */
11391140
if (unit->executed)
1140-
return false;
1141+
DBUG_RETURN(false);
11411142

11421143
/* Do not push conditions into recursive with tables */
11431144
if (derived->is_recursive_with_table())
1144-
return false;
1145+
DBUG_RETURN(false);
11451146

11461147
/* Do not push conditions into unit with global ORDER BY ... LIMIT */
11471148
if (unit->fake_select_lex && unit->fake_select_lex->explicit_limit)
1148-
return false;
1149+
DBUG_RETURN(false);
11491150

11501151
/* Check whether any select of 'unit' allows condition pushdown */
11511152
bool some_select_allows_cond_pushdown= false;
@@ -1158,7 +1159,7 @@ bool pushdown_cond_for_derived(THD *thd, Item *cond, TABLE_LIST *derived)
11581159
}
11591160
}
11601161
if (!some_select_allows_cond_pushdown)
1161-
return false;
1162+
DBUG_RETURN(false);
11621163

11631164
/*
11641165
Build the most restrictive condition extractable from 'cond'
@@ -1173,7 +1174,7 @@ bool pushdown_cond_for_derived(THD *thd, Item *cond, TABLE_LIST *derived)
11731174
if (!extracted_cond)
11741175
{
11751176
/* Nothing can be pushed into the derived table */
1176-
return false;
1177+
DBUG_RETURN(false);
11771178
}
11781179
/* Push extracted_cond into every select of the unit specifying 'derived' */
11791180
st_select_lex *save_curr_select= thd->lex->current_select;
@@ -1257,6 +1258,6 @@ bool pushdown_cond_for_derived(THD *thd, Item *cond, TABLE_LIST *derived)
12571258
sl->cond_pushed_into_having= extracted_cond_copy;
12581259
}
12591260
thd->lex->current_select= save_curr_select;
1260-
return false;
1261+
DBUG_RETURN(false);
12611262
}
12621263

0 commit comments

Comments
 (0)