diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-25 12:44:24 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-25 12:44:24 +0200 |
| commit | 961c7938bb4df7a19ccd8def1e57669f7600d3e5 (patch) | |
| tree | b3d208be6d95ea3e4d1ba81c78392517ffe8f7fd /sql/sql_derived.cc | |
| parent | 5adcb2e7b8f08cc459e478e5b118d924fbe18c86 (diff) | |
| parent | 3467f6376472ce695e36746ba5b3c13cb5fcbb9f (diff) | |
| download | mariadb-git-961c7938bb4df7a19ccd8def1e57669f7600d3e5.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 90d7ce8fc2c..35b4294707f 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -1452,6 +1452,8 @@ bool pushdown_cond_for_derived(THD *thd, Item *cond, TABLE_LIST *derived) for (; sl; sl= sl->next_select()) { Item *extracted_cond_copy; + if (!sl->cond_pushdown_is_allowed()) + continue; /* For each select of the unit except the last one create a clone of extracted_cond |