1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-05 16:15:50 +03:00

Merge branch 'develop' into MCOL-265

This commit is contained in:
Andrew Hutchings
2019-06-10 13:58:03 +01:00
committed by GitHub
383 changed files with 2979 additions and 24713 deletions

View File

@@ -1774,8 +1774,10 @@ void BatchPrimitiveProcessor::writeErrorMsg(const string& error, uint16_t errCod
// we don't need every field of these headers. Init'ing them anyway
// makes memory checkers happy.
memset(&ism, 0, sizeof(ISMPacketHeader));
memset(&ph, 0, sizeof(PrimitiveHeader));
void *ismp = static_cast<void*>(&ism);
void *php = static_cast<void*>(&ph);
memset(ismp, 0, sizeof(ISMPacketHeader));
memset(php, 0, sizeof(PrimitiveHeader));
ph.SessionID = sessionID;
ph.StepID = stepID;
ph.UniqueID = uniqueID;
@@ -1800,8 +1802,10 @@ void BatchPrimitiveProcessor::writeProjectionPreamble()
// we don't need every field of these headers. Init'ing them anyway
// makes memory checkers happy.
memset(&ism, 0, sizeof(ISMPacketHeader));
memset(&ph, 0, sizeof(PrimitiveHeader));
void *ismp = static_cast<void*>(&ism);
void *php = static_cast<void*>(&ph);
memset(ismp, 0, sizeof(ISMPacketHeader));
memset(php, 0, sizeof(PrimitiveHeader));
ph.SessionID = sessionID;
ph.StepID = stepID;
ph.UniqueID = uniqueID;
@@ -1899,8 +1903,10 @@ void BatchPrimitiveProcessor::makeResponse()
// we don't need every field of these headers. Init'ing them anyway
// makes memory checkers happy.
memset(&ism, 0, sizeof(ISMPacketHeader));
memset(&ph, 0, sizeof(PrimitiveHeader));
void *ismp = static_cast<void*>(&ism);
void *php = static_cast<void*>(&ph);
memset(ismp, 0, sizeof(ISMPacketHeader));
memset(php, 0, sizeof(PrimitiveHeader));
ph.SessionID = sessionID;
ph.StepID = stepID;
ph.UniqueID = uniqueID;