From d76c111690d90df9b43f11ae54e7e771124a5199 Mon Sep 17 00:00:00 2001
From: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date: Tue, 11 Jul 2017 15:14:24 +0100
Subject: [PATCH] Support ORDER BY NULL

---
 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 7c7ccc808..ce240b76d 100755
--- a/dbcon/mysql/ha_calpont_execplan.cpp
+++ b/dbcon/mysql/ha_calpont_execplan.cpp
@@ -6538,6 +6538,10 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, bool i
 						oss << ordercol->counter;
 						ord_cols += oss.str();
 					}
+                    else if (ord_item->type() == Item::NULL_ITEM)
+                    {
+                        // MCOL-793 Do nothing for an ORDER BY NULL
+                    }
 					else if (ord_item->type() == Item::SUM_FUNC_ITEM)
 					{
 						Item_sum* ifp = (Item_sum*)(*(ordercol->item));