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

Merge branch 'develop-1.1' into 1.1-merge-up-2018-10-05

Browse Source
This commit is contained in:
Andrew Hutchings
2018-10-05 18:40:07 +01:00
parent c0600d0da0 e183557b67
commit f1f13a09d1
22 changed files with 625 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
writeengine/shared/we_bulkrollbackmgr.cpp
View File

@ -198,14 +198,16 @@ int BulkRollbackMgr::rollback ( bool keepMetaFile )
// the user but keep going.
std::vector<BRM::OID_t> allOIDs;
std::set<OID>::const_iterator iter = fAllColDctOIDs.begin();
cerr << "Rollback flushing: ";
while (iter != fAllColDctOIDs.end())
{
cerr << *iter << ", ";
//std::cout << "Flushing OID from PrimProc cache " << *iter <<
// std::endl;
allOIDs.push_back(*iter);
++iter;
}
cerr << endl;
int cache_rc = cacheutils::flushOIDsFromCache( allOIDs );