database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-07 03:22:57 +03:00
Code Activity

Merge branch 'develop-1.1' into dev-merge-up-20180409

Browse Source
This commit is contained in:
Andrew Hutchings
2018-04-09 19:15:18 +01:00
parent 7075b9571d 3eb36e6bf9
commit 280dcb44bf
31 changed files with 304 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
primitives/linux-port/column.cpp
View File

@@ -39,6 +39,7 @@ using namespace boost;
#include "we_type.h"
#include "stats.h"
#include "primproc.h"
#include "dataconvert.h"
using namespace logging;
using namespace dbbc;
using namespace primitives;
@@ -603,7 +604,13 @@ inline bool colCompare(int64_t val1, int64_t val2, uint8_t COP, uint8_t rf, int
type == CalpontSystemCatalog::TEXT) && !isNull )
{
if (!regex.used && !rf)
{
// MCOL-1246 Trim trailing whitespace for matching, but not for
// regex
dataconvert::DataConvert::trimWhitespace(val1);
dataconvert::DataConvert::trimWhitespace(val2);
return colCompare_(order_swap(val1), order_swap(val2), COP);
}
else
return colStrCompare_(order_swap(val1), order_swap(val2), COP, rf, &regex);
}