diff --git a/dbcon/mysql/ha_mcs_pushdown.cpp b/dbcon/mysql/ha_mcs_pushdown.cpp index efb319cd6..da7c948bd 100644 --- a/dbcon/mysql/ha_mcs_pushdown.cpp +++ b/dbcon/mysql/ha_mcs_pushdown.cpp @@ -839,8 +839,13 @@ create_columnstore_select_handler(THD* thd, SELECT_LEX* select_lex) { handler= new ha_columnstore_select_handler(thd, select_lex); mcs_handler_info mhi= mcs_handler_info(reinterpret_cast(handler), SELECT); - // this::table is the place for the result set - int rc= ha_cs_impl_pushdown_init(&mhi, handler->table); + // handler::table is the place for the result set + int rc= 0; + // Skip execution for EXPLAIN queries + if (!thd->lex->describe) + { + rc= ha_cs_impl_pushdown_init(&mhi, handler->table); + } // Return SH even if init fails b/c CS changed SELECT_LEX structures // with simplify_joins_()