From aa802f44c534a21ff447b3025ae3e07ac323e337 Mon Sep 17 00:00:00 2001
From: David Hall <mcfadden7586@gmail.com>
Date: Fri, 29 Mar 2019 08:37:16 -0600
Subject: [PATCH] MCOL-1559 trailing white space comparison

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

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