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

Merge branch 'develop-1.1' into dev-merge-up-20180202

Browse Source
This commit is contained in:
Andrew Hutchings
2018-02-02 14:53:36 +00:00
parent 5eb3bbb3f6 c792188a5f
commit 0d7c0f7ae4
77 changed files with 1371 additions and 2547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/libmysql_client/libmysql_client.cpp
View File

@ -68,7 +68,7 @@ int LibMySQL::init(const char* h, unsigned int p, const char* u, const char* w,
if (!(TLSCA.empty() || TLSClientCert.empty() || TLSClientKey.empty()))
{
mysql_ssl_set(fCon, TLSClientKey.c_str(), TLSClientCert.c_str(),
TLSCA.c_str(), NULL, NULL);
TLSCA.c_str(), NULL, NULL);
}
if (fCon != NULL)
@ -117,7 +117,7 @@ int LibMySQL::run(const char* query)
return ret;
}
void LibMySQL::handleMySqlError(const char* errStr, unsigned int errCode)
void LibMySQL::handleMySqlError(const char* errStr, unsigned int errCode)
{
ostringstream oss;
oss << errStr << "(" << errCode << ")";