From 0c113f2bb300f0d1a8310f1a1e9dd6372b69da6b Mon Sep 17 00:00:00 2001 From: Roman Nozdrin Date: Sat, 23 Jun 2018 23:03:39 +0300 Subject: [PATCH] MCOL-1497 GROUP BY handler supports outer joins now. --- dbcon/mysql/ha_calpont_execplan.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dbcon/mysql/ha_calpont_execplan.cpp b/dbcon/mysql/ha_calpont_execplan.cpp index 8df06c6b4..94deaf676 100644 --- a/dbcon/mysql/ha_calpont_execplan.cpp +++ b/dbcon/mysql/ha_calpont_execplan.cpp @@ -8089,9 +8089,9 @@ int cp_get_group_plan(THD* thd, SCSEP& csep, cal_impl_if::cal_group_info& gi) gwi.thd = thd; int status = getGroupPlan(gwi, select_lex, csep, gi); -// cerr << "---------------- cp_get_group_plan EXECUTION PLAN ----------------" << endl; -// cerr << *csep << endl ; -// cerr << "-------------- EXECUTION PLAN END --------------\n" << endl; + cerr << "---------------- cp_get_group_plan EXECUTION PLAN ----------------" << endl; + cerr << *csep << endl ; + cerr << "-------------- EXECUTION PLAN END --------------\n" << endl; if (status > 0) return ER_INTERNAL_ERROR; @@ -8386,7 +8386,9 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro gwi.rcWorkStack.push(new ConstantColumn((int64_t)0, ConstantColumn::NUM)); } - uint32_t failed = buildOuterJoin(gwi, select_lex); + SELECT_LEX tmp_select_lex; + tmp_select_lex.table_list.first = gi.groupByTables; + uint32_t failed = buildOuterJoin(gwi, tmp_select_lex); if (failed) return failed;