From f8c08f8b0bf46618275c3bc2511b059443515a32 Mon Sep 17 00:00:00 2001 From: Roman Nozdrin Date: Sun, 22 Apr 2018 23:45:36 +0300 Subject: [PATCH] MCOL-1052 WIP Fixed ORDER BY NULL query processing by group_by_handler. --- dbcon/mysql/ha_calpont_execplan.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dbcon/mysql/ha_calpont_execplan.cpp b/dbcon/mysql/ha_calpont_execplan.cpp index b17e0ab3e..18f5aaaee 100644 --- a/dbcon/mysql/ha_calpont_execplan.cpp +++ b/dbcon/mysql/ha_calpont_execplan.cpp @@ -919,7 +919,12 @@ void debug_walk(const Item* item, void* arg) cerr << "Window Function Item " << ifp->window_func()->func_name() << endl; break; } - + + case Item::NULL_ITEM: + { + cerr << "NULL item" << endl; + break; + } default: { cerr << "UNKNOWN_ITEM type " << item->type() << endl; @@ -8722,7 +8727,7 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro case Item::NULL_ITEM: { - if ( ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE ) || ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE_MULTI ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE_MULTI ) ) + /*if ( ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE ) || ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE_MULTI ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE_MULTI ) ) { } else { @@ -8739,7 +8744,7 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro sel_cols_in_create += name; gwi.selectCols.push_back("null"); - } + }*/ break; }