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

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

Browse Source
This commit is contained in:
Andrew Hutchings
2017-12-12 20:26:00 +00:00
parent b795e6b781 ca2c511f59
commit 59d0a45da3
8 changed files with 146 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
writeengine/bulk/we_bulkloadbuffer.cpp
View File

@ -41,6 +41,8 @@
#include "joblisttypes.h"
#include "utils_utf8.h"
using namespace std;
using namespace boost;
using namespace execplan;
@ -545,7 +547,8 @@ void BulkLoadBuffer::convert(char* field, int fieldLength,
// on disk (e.g. 5 for a varchar(5) instead of 8).
if (fieldLength > column.definedWidth)
{
memcpy( charTmpBuf, field, column.definedWidth );
uint8_t truncate_point = funcexp::utf8::utf8_truncate_point(field, column.definedWidth);
memcpy( charTmpBuf, field, column.definedWidth - truncate_point );
bufStats.satCount++;
}
else