database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-27 21:01:50 +03:00
Code Activity

Merge branch 'develop' of github.com:mariadb-corporation/mariadb-columnstore-engine into S3-project

Browse Source
This commit is contained in:
Patrick LeBlanc
2019-05-17 13:24:09 -05:00
parent 3c32f6d888 355e2f914f
commit 3d67df18bf
330 changed files with 1159 additions and 23299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
versioning/BRM/extentmap.cpp
View File

@ -1141,7 +1141,8 @@ void ExtentMap::loadVersion4(ifstream& in)
in.read((char*) &flNumElements, sizeof(int));
idbassert(emNumElements > 0);
memset(fExtentMap, 0, fEMShminfo->allocdSize);
void *fExtentMapPtr = static_cast<void*>(fExtentMap);
memset(fExtentMapPtr, 0, fEMShminfo->allocdSize);
fEMShminfo->currentSize = 0;
// init the free list
@ -1226,7 +1227,8 @@ void ExtentMap::loadVersion4(IDBDataFile* in)
throw runtime_error("ExtentMap::loadVersion4(): read failed. Check the error log.");
}
memset(fExtentMap, 0, fEMShminfo->allocdSize);
void *fExtentMapPtr = static_cast<void*>(fExtentMap);
memset(fExtentMapPtr, 0, fEMShminfo->allocdSize);
fEMShminfo->currentSize = 0;
// init the free list