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

MCOl-3536 Collation phase 2

Browse Source
This commit is contained in:
David Hall
2020-06-15 11:08:59 -05:00
parent 165ae4a6f3
commit d0818f2b4e
6 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
utils/funcexp/func_substring_index.cpp
View File

@ -66,7 +66,7 @@ std::string Func_substring_index::getStrVal(rowgroup::Row& row,
if (isNull)
return "";
if (strLen == 0 || delimLen == 0 || !count == 0)
if (strLen == 0 || delimLen == 0 || count == 0)
return "";
if (count > strLen)
@ -75,9 +75,10 @@ std::string Func_substring_index::getStrVal(rowgroup::Row& row,
if ((count < 0) && ((count * -1) > strLen))
return str;
bool binaryCmp = (cs->state & MY_CS_BINSORT) || !cs->use_mb();
std::string value; // Only used if !use_mb()
if (cs->use_mb()) // Charset supports multibyte characters
if (!binaryCmp) // Charset supports multibyte characters
{
const char* src = str.c_str();
const char* srcEnd = src + strLen;