From 5fe838876093f3ce0bb22c2ab0f14aec945c1e93 Mon Sep 17 00:00:00 2001
From: Gagan Goel <gagan.nith@gmail.com>
Date: Tue, 17 Sep 2019 00:45:04 -0400
Subject: [PATCH] Undo commit e60fbf260f4b67907925bf637bc64516d401b42e

---
 dbcon/mysql/ha_mcs_pushdown.cpp | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/dbcon/mysql/ha_mcs_pushdown.cpp b/dbcon/mysql/ha_mcs_pushdown.cpp
index 3f034d412..406d4ae43 100644
--- a/dbcon/mysql/ha_mcs_pushdown.cpp
+++ b/dbcon/mysql/ha_mcs_pushdown.cpp
@@ -718,18 +718,6 @@ create_columnstore_select_handler(THD* thd, SELECT_LEX* select_lex)
         return handler;
     }
 
-    // This block gives false positive in
-    // partitionOptimization/vTpch11.
-    // Disable SH processing for UNION in a subquery.
-    // This way, the server falls back to using the DH for executing
-    // the UNION, if enabled.
-    /*TABLE_LIST *tbl_ptr = select_lex->get_table_list();
-    if (tbl_ptr && tbl_ptr->derived &&
-        (tbl_ptr->derived->is_unit_op() || tbl_ptr->derived->fake_select_lex))
-    {
-        return handler;
-    }*/
-
     bool unsupported_feature = false;
     // Select_handler use the short-cut that effectively disables
     // INSERT..SELECT, LDI, SELECT..INTO OUTFILE