1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00

Revert "MCOL-1559 trailing white space comparison"

This reverts commit aa802f44c5.
This commit is contained in:
Andrew Hutchings
2019-05-23 13:48:56 +01:00
parent e7a331f3f8
commit 922e828d6c

View File

@ -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: ???