From 42f29096f0cc9f639ddc46e0ea0854eebdcf3d6b Mon Sep 17 00:00:00 2001
From: Roman Nozdrin <roman.nozdrin@mariadb.com>
Date: Thu, 23 May 2019 22:22:55 +0300
Subject: [PATCH] MCOL-3239 CS pushes relevant filter predicates into derived
 tables.     This change disables predicate push for function column that    
 contains both derived table column and non-derived table column.

---
 dbcon/execplan/functioncolumn.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dbcon/execplan/functioncolumn.cpp b/dbcon/execplan/functioncolumn.cpp
index 487d42c0b..665e4a4c3 100644
--- a/dbcon/execplan/functioncolumn.cpp
+++ b/dbcon/execplan/functioncolumn.cpp
@@ -420,6 +420,16 @@ void FunctionColumn::setDerivedTable()
                 break;
             }
         }
+        // MCOL-3239 Block for func column with both
+        // derived table column and normal table column.
+        else if (derivedTableAlias == "")
+        {
+            if (sc->tableAlias().length())
+            {
+                derivedTableAlias = "";
+                break;
+            }
+        }
     }
 
     fDerivedTable = derivedTableAlias;