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 remote-tracking branch 'upstream/develop' into S3-project

Browse Source
This commit is contained in:
Patrick LeBlanc
2019-06-24 15:41:10 -05:00
parent eead61f238 95c4f1286e
commit b30ee07318
179 changed files with 4688 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
versioning/BRM/slavecomm.cpp
View File

@ -1891,7 +1891,6 @@ void SlaveComm::do_vbRollback1(ByteStream& msg)
if (!standalone)
master.write(reply);
//takeSnapshot = true;
doSaveDelta = true;
}
@ -1931,7 +1930,6 @@ void SlaveComm::do_vbRollback2(ByteStream& msg)
if (!standalone)
master.write(reply);
//takeSnapshot = true;
doSaveDelta = true;
}
@ -1964,7 +1962,6 @@ void SlaveComm::do_vbCommit(ByteStream& msg)
if (!standalone)
master.write(reply);
//takeSnapshot = true;
doSaveDelta = true;
}
@ -2065,7 +2062,7 @@ void SlaveComm::do_confirm()
saveFileToggle = !saveFileToggle;
const char* filename = journalName.c_str();
uint32_t utmp = ::umask(0);
//uint32_t utmp = ::umask(0);
delete journalh;
journalh = IDBDataFile::open(
IDBPolicy::getType(filename, IDBPolicy::WRITEENG), filename, "w+b", 0);