1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00

Fixed a merge error.

This commit is contained in:
Patrick LeBlanc
2019-08-05 16:35:59 -05:00
parent 295c638c18
commit 62c7ab6480

View File

@ -1284,7 +1284,7 @@ void ExtentMap::load(const string& filename, bool fixFL)
throw runtime_error("ExtentMap::load(): That file is not a valid ExtentMap image"); throw runtime_error("ExtentMap::load(): That file is not a valid ExtentMap image");
} }
} }
else // fstream path to be remove catch (...)
{ {
releaseFreeList(WRITE); releaseFreeList(WRITE);
releaseEMEntryTable(WRITE); releaseEMEntryTable(WRITE);
@ -1310,7 +1310,6 @@ void ExtentMap::save(const string& filename)
#endif #endif
int allocdSize, loadSize[3], i; int allocdSize, loadSize[3], i;
mode_t utmp;
grabEMEntryTable(READ); grabEMEntryTable(READ);