From 1c0afc95bc280890fd65e276fa4b9f58d28ec0de Mon Sep 17 00:00:00 2001 From: jmrojas2332 Date: Tue, 19 Nov 2019 14:07:47 +0000 Subject: [PATCH] MCOL 2072 Query Stats supress warning when calling libmysql::run --- utils/libmysql_client/libmysql_client.cpp | 4 ++-- utils/libmysql_client/libmysql_client.h | 2 +- utils/querystats/querystats.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/libmysql_client/libmysql_client.cpp b/utils/libmysql_client/libmysql_client.cpp index 32f117dd5..71cf6ec3d 100644 --- a/utils/libmysql_client/libmysql_client.cpp +++ b/utils/libmysql_client/libmysql_client.cpp @@ -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; diff --git a/utils/libmysql_client/libmysql_client.h b/utils/libmysql_client/libmysql_client.h index b866d4104..e7437c83c 100644 --- a/utils/libmysql_client/libmysql_client.h +++ b/utils/libmysql_client/libmysql_client.h @@ -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); diff --git a/utils/querystats/querystats.cpp b/utils/querystats/querystats.cpp index 306ed7c11..cc9a1d51c 100644 --- a/utils/querystats/querystats.cpp +++ b/utils/querystats/querystats.cpp @@ -228,7 +228,7 @@ void QueryStats::insert() insert << fNumFiles << ", "; insert << fFileBytes << ")"; // the last 2 fields are not populated yet - ret = mysql.run(insert.str().c_str()); + ret = mysql.run(insert.str().c_str(), false); if (ret != 0) mysql.handleMySqlError(mysql.getError().c_str(), ret);