database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +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

4
writeengine/dictionary/we_dctnry.cpp
View File

@ -47,6 +47,7 @@ using namespace BRM;
#include "IDBPolicy.h"
#include "cacheutils.h"
using namespace idbdatafile;
#include "utils_utf8.h"
namespace
{
@ -858,7 +859,8 @@ int Dctnry::insertDctnry(const char* buf,
// @Bug 2565: Truncate any strings longer than schema's column width
if (curSig.size > m_colWidth)
{
curSig.size = m_colWidth;
uint8_t truncate_point = funcexp::utf8::utf8_truncate_point((const char*)curSig.signature, m_colWidth);
curSig.size = m_colWidth - truncate_point;
++truncCount;
}