From 73f7307ca264d775c9b636bbadb813df5da3f998 Mon Sep 17 00:00:00 2001
From: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date: Thu, 23 May 2019 13:48:18 +0100
Subject: [PATCH] Revert "MCOL-1559 trailing space compare"

This reverts commit e2cb6444843494e62ae8eacb0a1c3425400b7f69.
---
 dbcon/execplan/predicateoperator.h | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/dbcon/execplan/predicateoperator.h b/dbcon/execplan/predicateoperator.h
index 08f0c40cf..daa078948 100644
--- a/dbcon/execplan/predicateoperator.h
+++ b/dbcon/execplan/predicateoperator.h
@@ -456,8 +456,18 @@ inline bool PredicateOperator::getBoolVal(rowgroup::Row& row, bool& isNull, Retu
                 isNull = false;
                 return !ret;
             }
+#if 0   
+                if (isNull)
+                return false;
 
-            // MCOL-1559
+            const std::string& val1 = lop->getStrVal(row, isNull);
+
+            if (isNull)
+                return false;
+
+            return strCompare(val1, rop->getStrVal(row, isNull)) && !isNull;
+#endif
+	    // MCOL-1559
 	    std::string val1 = lop->getStrVal(row, isNull);
             if (isNull)
                 return false;