From b70e9b5f6783d17ee8ad96a9b03bf42e00c71d29 Mon Sep 17 00:00:00 2001
From: David Hall <david.hall@mariadb.com>
Date: Tue, 24 Oct 2017 13:36:50 -0500
Subject: [PATCH] MCOL-985 Add return code test after call to
 buildReturnedColumn

---
 dbcon/mysql/ha_calpont_execplan.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dbcon/mysql/ha_calpont_execplan.cpp b/dbcon/mysql/ha_calpont_execplan.cpp
index 3f38d87cc..494763c35 100755
--- a/dbcon/mysql/ha_calpont_execplan.cpp
+++ b/dbcon/mysql/ha_calpont_execplan.cpp
@@ -3606,6 +3606,10 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
             else
             {
                 rc = buildReturnedColumn(ord_col, gwi, gwi.fatalParseError);
+				if (!rc || gwi.fatalParseError)
+				{
+					return NULL;
+				}
             }
             // 10.2 TODO: direction is now a tri-state flag
 			rc->asc((*order_item)->direction == ORDER::ORDER_ASC ? true : false);