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 develop-1.2-merge-up-20190619

Browse Source
This commit is contained in:
Andrew Hutchings
2019-06-19 18:34:43 +01:00
parent 467581665d bfaa7b0d54
commit cddb776bd4
6 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
writeengine/bulk/we_bulkloadbuffer.cpp
View File

@ -569,14 +569,16 @@ void BulkLoadBuffer::convert(char* field, int fieldLength,
}
// Swap byte order before comparing character string
int64_t binChar = static_cast<int64_t>( uint64ToStr(
*(reinterpret_cast<uint64_t*>(charTmpBuf)) ) );
// Compare must be unsigned
uint64_t compChar = uint64ToStr( *(reinterpret_cast<uint64_t*>(charTmpBuf)) );
int64_t binChar = static_cast<int64_t>( compChar );
// Update min/max range
if (binChar < bufStats.minBufferVal)
uint64_t minVal = static_cast<uint64_t>( bufStats.minBufferVal );
uint64_t maxVal = static_cast<uint64_t>( bufStats.maxBufferVal );
if (compChar < minVal)
bufStats.minBufferVal = binChar;
if (binChar > bufStats.maxBufferVal)
if (compChar > maxVal)
bufStats.maxBufferVal = binChar;
pVal = charTmpBuf;