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-5437 Fixes to follow the charset_info api change introduced by MDEV-30661

Browse Source
This commit is contained in:
Roman Nozdrin
2023-02-24 14:29:26 +00:00
committed by Gagan Goel
parent 7cb8e339c5
commit 5278865430
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/funcexp/func_lcase.cpp
View File

@ -53,7 +53,11 @@ std::string Func_lcase::getStrVal(rowgroup::Row& row, FunctionParm& fp, bool& is
CHARSET_INFO* cs = colType.getCharset(); CHARSET_INFO* cs = colType.getCharset();
uint64_t inLen = tstr.length(); uint64_t inLen = tstr.length();
#if MYSQL_VERSION_ID >= 101004
uint64_t bufLen = inLen * cs->casedn_multiply();
#else
uint64_t bufLen = inLen * cs->casedn_multiply; uint64_t bufLen = inLen * cs->casedn_multiply;
#endif
char* outBuf = new char[bufLen]; char* outBuf = new char[bufLen];
uint64_t outLen = cs->casedn(tstr.c_str(), inLen, outBuf, bufLen); uint64_t outLen = cs->casedn(tstr.c_str(), inLen, outBuf, bufLen);

6
utils/funcexp/func_ucase.cpp
View File

@ -62,7 +62,11 @@ std::string Func_ucase::getStrVal(rowgroup::Row& row, FunctionParm& fp, bool& is
CHARSET_INFO* cs = colType.getCharset(); CHARSET_INFO* cs = colType.getCharset();
uint64_t inLen = tstr.length(); uint64_t inLen = tstr.length();
uint64_t bufLen = inLen * cs->caseup_multiply; #if MYSQL_VERSION_ID >= 101004
uint64_t bufLen = inLen * cs->casedn_multiply();
#else
uint64_t bufLen = inLen * cs->casedn_multiply;
#endif
char* outBuf = new char[bufLen]; char* outBuf = new char[bufLen];
uint64_t outLen = cs->caseup(tstr.c_str(), inLen, outBuf, bufLen); uint64_t outLen = cs->caseup(tstr.c_str(), inLen, outBuf, bufLen);