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-3536 Collation

Browse Source
This commit is contained in:
David Hall
2020-06-08 17:57:37 -05:00
parent d289c30521
commit f9078efbc6
38 changed files with 79 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
utils/funcexp/func_rpad.cpp
View File

@ -20,10 +20,6 @@
*
*
****************************************************************************/
#include <mariadb.h>
#undef set_bits // mariadb.h defines set_bits, which is incompatible with boost
#include <my_sys.h>
#include "errorids.h"
#include <string>
using namespace std;
@ -39,7 +35,7 @@ using namespace rowgroup;
#include "joblisttypes.h"
using namespace joblist;
#define STRCOLL_ENH__
#include "collation.h"
namespace funcexp
{
@ -115,10 +111,10 @@ std::string Func_rpad::getStrVal(rowgroup::Row& row,
while (padLength >= plen)
{
memcpy(pBuf, posP, plen);
memcpy(pBuf, posP, binPLen);
padLength -= plen;
byteCount += plen;
pBuf += plen;
byteCount += binPLen;
pBuf += binPLen;
}
// Sometimes, in a case with multi-char pad, we need to add a partial pad
if (padLength > 0)