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

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

Browse Source
This commit is contained in:
david hill
2016-10-24 17:53:58 -05:00
parent c30e80393b b1a110b830
commit 41a43ad5ea
3 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
oam/oamcpp/liboamcpp.cpp
View File

@@ -4644,9 +4644,7 @@ namespace oam
if (!file.is_open())
{
ostringstream os;
os << "checkLogStatus error while opening file " << fileName << " " << strerror(errno);
writeLog(os.str(), LOG_TYPE_ERROR );
return false;
}
string buf;
@@ -4659,14 +4657,9 @@ namespace oam
}
if (file.bad())
{
ostringstream os;
os << "checkLogStatus error while reading file " << fileName << " " << strerror(errno);
writeLog(os.str(), LOG_TYPE_ERROR );
return false;
}
file.close();
ostringstream os;
os << "checkLogStatus failed " << fileName << " expected \"" << phrase.c_str() << "\" found \"" << buf.c_str() << "\"";
writeLog(os.str(), LOG_TYPE_ERROR );
return false;
}