tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect value for IdoMysqlConnection::m_AffectedRows 

refs #10190
This commit is contained in:
Gunnar Beutner 2015-09-28 13:19:13 +02:00
parent 8a5d71a565
commit d24af1e639
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/db_ido/dbconnection.cpp
View File

@ -394,8 +394,8 @@ void DbConnection::PrepareDatabase(void)
//ClearConfigTable("contactgroups");
//ClearConfigTable("contacts");
//ClearConfigTable("contactstatus");
ClearConfigTable("customvariables");
ClearConfigTable("customvariablestatus");
//ClearConfigTable("customvariables");
//ClearConfigTable("customvariablestatus");
//ClearConfigTable("endpoints");
//ClearConfigTable("endpointstatus");
ClearConfigTable("host_contactgroups");

8
lib/db_ido_mysql/idomysqlconnection.cpp
View File

@ -442,9 +442,9 @@ void IdoMysqlConnection::FinishAsyncQueries(bool force)
for (std::vector<IdoAsyncQuery>::size_type i = offset; i < offset + count; i++) {
const IdoAsyncQuery& aq = queries[i];
m_AffectedRows = mysql_affected_rows(&m_Connection);
MYSQL_RES *result = mysql_store_result(&m_Connection);
MYSQL_RES *result = mysql_use_result(&m_Connection);
m_AffectedRows = mysql_affected_rows(&m_Connection);
IdoMysqlResult iresult;
@ -510,9 +510,9 @@ IdoMysqlResult IdoMysqlConnection::Query(const String& query)
);
}
m_AffectedRows = mysql_affected_rows(&m_Connection);
MYSQL_RES *result = mysql_store_result(&m_Connection);
MYSQL_RES *result = mysql_use_result(&m_Connection);
m_AffectedRows = mysql_affected_rows(&m_Connection);
if (!result) {
if (mysql_field_count(&m_Connection) > 0) {