You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-07-29 08:21:15 +03:00
Merge branch 'develop-1.1' into 1.1-merge-up-20180621
This commit is contained in:
@ -119,13 +119,17 @@ int LibMySQL::run(const char* query)
|
||||
|
||||
void LibMySQL::handleMySqlError(const char* errStr, unsigned int errCode)
|
||||
{
|
||||
ostringstream oss;
|
||||
oss << errStr << "(" << errCode << ")";
|
||||
|
||||
if (errCode == (unsigned int) - 1)
|
||||
oss << "(null pointer)";
|
||||
ostringstream oss;
|
||||
if (mysql->getErrno())
|
||||
{
|
||||
oss << errStr << " (" << mysql->getErrno() << ")";
|
||||
oss << " (" << mysql->getErrorMsg() << ")";
|
||||
}
|
||||
else
|
||||
oss << "(" << errCode << ")";
|
||||
{
|
||||
oss << errStr << " (" << errCode << ")";
|
||||
oss << " (unknown)";
|
||||
}
|
||||
|
||||
throw logging::IDBExcept(oss.str(), logging::ERR_CROSS_ENGINE_CONNECT);
|
||||
|
||||
|
@ -71,6 +71,8 @@ public:
|
||||
{
|
||||
return fErrStr;
|
||||
}
|
||||
unsigned int getErrno() { return mysql_errno(fCon); }
|
||||
const char* getErrorMsg() { return mysql_error(fCon); }
|
||||
|
||||
private:
|
||||
MYSQL* fCon;
|
||||
|
Reference in New Issue
Block a user