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

Merge pull request #961 from LinuxJedi/MCOL-3647

Browse Source 
Merge develop-1.2 into develop
This commit is contained in:
benthompson15
2019-12-05 23:59:38 +01:00
committed by GitHub
parent a1415b1e13 1c0afc95bc
commit 118efd473b
4 changed files with 234 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/libmysql_client/libmysql_client.cpp
View File

@ -96,7 +96,7 @@ int LibMySQL::init(const char* h, unsigned int p, const char* u, const char* w,
}
int LibMySQL::run(const char* query)
int LibMySQL::run(const char* query, bool resultExpected)
{
int ret = 0;
@ -109,7 +109,7 @@ int LibMySQL::run(const char* query)
fRes = mysql_use_result(fCon);
if (fRes == NULL)
if (fRes == NULL && resultExpected)
{
fErrStr = "fatal error running mysql_use_result() or empty result set in libmysql_client lib";
ret = -1;

2
utils/libmysql_client/libmysql_client.h
View File

@ -36,7 +36,7 @@ public:
int init(const char*, unsigned int, const char*, const char*, const char*);
// run the query
int run(const char* q);
int run(const char* q, bool resultExpected = true);
void handleMySqlError(const char*, int);