From c957048a5164a20a8e272270260280554a43264e Mon Sep 17 00:00:00 2001 From: David Hall Date: Wed, 22 Apr 2020 15:02:47 -0500 Subject: [PATCH] MCOL-3757 Correct overwrite of MCOL-3903 This line for MCOL-3757 is incorrect given MCOL-3903 and it breaks things --- dbcon/mysql/ha_mcs_execplan.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dbcon/mysql/ha_mcs_execplan.cpp b/dbcon/mysql/ha_mcs_execplan.cpp index d9b87130a..6c438744c 100755 --- a/dbcon/mysql/ha_mcs_execplan.cpp +++ b/dbcon/mysql/ha_mcs_execplan.cpp @@ -7853,8 +7853,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, } // We don't currently support limit with correlated subquery - if (csep->limitNum() != (uint64_t) - 1 && - gwi.subQuery && !gwi.correlatedTbNameVec.empty()) + if ((rc = processLimitAndOffset(select_lex, gwi, csep, unionSel, isUnion, isSelectHandlerTop))) { return rc; }