1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-02 17:22:27 +03:00

Merge pull request #1032 from drrtuy/MCOL-3766

MCOL-3766 EXPLAIN now doesn't execute query via SH thus doesn't fail
This commit is contained in:
David.Hall
2020-02-10 10:08:38 -06:00
committed by Patrick LeBlanc
parent bfe3ab14c0
commit f71158601e

View File

@ -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<void*>(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_()