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

This reverts commit aa802f44c534a21ff447b3025ae3e07ac323e337.
---
 dbcon/execplan/predicateoperator.h | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/dbcon/execplan/predicateoperator.h b/dbcon/execplan/predicateoperator.h
index f81f189bb..b83931394 100644
--- a/dbcon/execplan/predicateoperator.h
+++ b/dbcon/execplan/predicateoperator.h
@@ -36,7 +36,6 @@
 #endif
 #include <cstring>
 #include <boost/regex.hpp>
-#include <boost/algorithm/string/trim.hpp>
 
 #include "expressionparser.h"
 #include "returnedcolumn.h"
@@ -461,17 +460,11 @@ inline bool PredicateOperator::getBoolVal(rowgroup::Row& row, bool& isNull, Retu
                 return false;
 
             const std::string& val1 = lop->getStrVal(row, isNull);
+
             if (isNull)
                 return false;
 
-            const std::string& val2 = rop->getStrVal(row, isNull);
-            if (isNull)
-                return false;
-
-            boost::trim_right_if(val1, boost::is_any_of(" "));
-            boost::trim_right_if(val2, boost::is_any_of(" "));
-
-            return strCompare(val1, val2);
+            return strCompare(val1, rop->getStrVal(row, isNull)) && !isNull;
         }
 
         //FIXME: ???