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

MCOL-4422 Remove mariadb.h and my_sys.h dependency from collation.h

Browse Source
This commit is contained in:
Alexander Barkov
2020-11-30 14:18:26 +04:00
parent 454ec4be99
commit 2ea73846b9
26 changed files with 175 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
primitives/linux-port/dictionary.cpp
View File

@ -145,7 +145,7 @@ void PrimitiveProcessor::p_TokenByScan(const TokenByScanRequestHeader* h,
offsets = reinterpret_cast<const uint16_t*>(&niceBlock[10]);
niceInput = reinterpret_cast<const uint8_t*>(h);
const CHARSET_INFO* cs = get_charset(h->charsetNumber, MYF(MY_WME));
const CHARSET_INFO* cs = & datatypes::Charset(h->charsetNumber).getCharset();
// if LIKE is an operator, compile regexp's in advance.
if ((h->NVALS > 0 && h->COP1 & COMPARE_LIKE) ||
@ -662,7 +662,7 @@ void PrimitiveProcessor::p_Dictionary(const DictInput* in,
uint16_t aggCount;
bool cmpResult;
DictOutput header;
const CHARSET_INFO* cs = get_charset(charsetNumber, MYF(MY_WME));
const CHARSET_INFO* cs = & datatypes::Charset(charsetNumber).getCharset();
// default size of the ouput to something sufficiently large to prevent
// excessive reallocation and copy when resizing