database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

MCOL-520. Fixed several instances where we were using a too-new

Browse Source 
contructor to ifstream.
This commit is contained in:
Patrick LeBlanc
2018-10-10 14:58:50 -05:00
parent 6a353b40b5
commit f3ce845842
3 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbcon/mysql/ha_calpont_impl.cpp
View File

@ -3058,7 +3058,7 @@ int ha_calpont_impl_rnd_init(TABLE* table)
// plan serialization // plan serialization
string tmpDir = aTmpDir + "/li1-plan.hex"; string tmpDir = aTmpDir + "/li1-plan.hex";
ifstream ifs(tmpDir); ifstream ifs(tmpDir.c_str());
ByteStream bs1; ByteStream bs1;
ifs >> bs1; ifs >> bs1;
ifs.close(); ifs.close();

2
procmgr/processmanager.cpp
View File

@ -11114,7 +11114,7 @@ int ProcessManager::mountDBRoot(std::string dbrootID)
system(cmd.c_str()); system(cmd.c_str());
} }
ifstream in(tmpMount); ifstream in(tmpMount.c_str());
in.seekg(0, std::ios::end); in.seekg(0, std::ios::end);
int size = in.tellg(); int size = in.tellg();

12
procmon/processmonitor.cpp
View File

@ -1548,7 +1548,7 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO
system(cmd.c_str()); system(cmd.c_str());
string tmpFile = tmpLogDir + "/mysqldstart"; string tmpFile = tmpLogDir + "/mysqldstart";
ifstream file (tmpFile); ifstream file (tmpFile.c_str());
if (!file) if (!file)
{ {
@ -1829,7 +1829,7 @@ void ProcessMonitor::processMessage(messageqcpp::ByteStream msg, messageqcpp::IO
} }
return_status = API_SUCCESS; return_status = API_SUCCESS;
ifstream in(tmpMount); ifstream in(tmpMount.c_str());
in.seekg(0, std::ios::end); in.seekg(0, std::ios::end);
int size = in.tellg(); int size = in.tellg();
@ -5348,7 +5348,7 @@ int ProcessMonitor::runMasterRep(std::string& masterLogFile, std::string& master
// in log - show-master-status.log // in log - show-master-status.log
string masterLog = tmpLogDir + "/show-master-status.log"; string masterLog = tmpLogDir + "/show-master-status.log";
ifstream file (masterLog); ifstream file (masterLog.c_str());
if (!file) if (!file)
{ {
@ -6298,7 +6298,7 @@ int ProcessMonitor::checkDataMount()
cmd = "export LC_ALL=C;mount " + dbroot + " > " + mountLog + " 2>&1"; cmd = "export LC_ALL=C;mount " + dbroot + " > " + mountLog + " 2>&1";
system(cmd.c_str()); system(cmd.c_str());
ifstream in(mountLog); ifstream in(mountLog.c_str());
in.seekg(0, std::ios::end); in.seekg(0, std::ios::end);
int size = in.tellg(); int size = in.tellg();
@ -6506,7 +6506,7 @@ int ProcessMonitor::glusterAssign(std::string dbrootID)
{ {
log.writeLog(__LINE__, "glusterAssign mount failure: dbroot: " + dbrootID + " error: " + oam.itoa(WEXITSTATUS(ret)), LOG_TYPE_ERROR); log.writeLog(__LINE__, "glusterAssign mount failure: dbroot: " + dbrootID + " error: " + oam.itoa(WEXITSTATUS(ret)), LOG_TYPE_ERROR);
ifstream in(tmpLog); ifstream in(tmpLog.c_str());
in.seekg(0, std::ios::end); in.seekg(0, std::ios::end);
int size = in.tellg(); int size = in.tellg();
@ -6551,7 +6551,7 @@ int ProcessMonitor::glusterUnassign(std::string dbrootID)
{ {
log.writeLog(__LINE__, "glusterUnassign mount failure: dbroot: " + dbrootID + " error: " + oam.itoa(WEXITSTATUS(ret)), LOG_TYPE_ERROR); log.writeLog(__LINE__, "glusterUnassign mount failure: dbroot: " + dbrootID + " error: " + oam.itoa(WEXITSTATUS(ret)), LOG_TYPE_ERROR);
ifstream in(tmpLog); ifstream in(tmpLog.c_str());
in.seekg(0, std::ios::end); in.seekg(0, std::ios::end);
int size = in.tellg(); int size = in.tellg();