1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-04 04:42:30 +03:00

Fix merge and coding style issues

This commit is contained in:
Andrew Hutchings
2018-06-22 15:31:31 +01:00
parent 7ca289ded9
commit 8c90419852
49 changed files with 1198 additions and 925 deletions

View File

@ -119,16 +119,17 @@ int LibMySQL::run(const char* query)
void LibMySQL::handleMySqlError(const char* errStr, unsigned int errCode)
{
ostringstream oss;
if (mysql->getErrno())
ostringstream oss;
if (getErrno())
{
oss << errStr << " (" << mysql->getErrno() << ")";
oss << " (" << mysql->getErrorMsg() << ")";
oss << errStr << " (" << getErrno() << ")";
oss << " (" << getErrorMsg() << ")";
}
else
{
oss << errStr << " (" << errCode << ")";
oss << " (unknown)";
oss << errStr << " (" << errCode << ")";
oss << " (unknown)";
}
throw logging::IDBExcept(oss.str(), logging::ERR_CROSS_ENGINE_CONNECT);