Fix incorrect value for IdoMysqlConnection::m_AffectedRows

refs #10190

diff --git a/lib/db_ido/dbconnection.cpp b/lib/db_ido/dbconnection.cpp
index f2b6b90af728e656d2cf98ee474d0d6d890556d5..eebf0056a554c11d0d863cd7d411a3dd1de64f89 100644 (file)
--- a/lib/db_ido/dbconnection.cpp
+++ b/lib/db_ido/dbconnection.cpp
@@ -378,8 +378,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");

diff --git a/lib/db_ido_mysql/idomysqlconnection.cpp b/lib/db_ido_mysql/idomysqlconnection.cpp
index 95dd45183c60c4d33d4d5ecc78aec5e78220965a..3f703f08888d3bf8b1f3c5754e7f85850e2a312b 100644 (file)
--- a/lib/db_ido_mysql/idomysqlconnection.cpp
+++ b/lib/db_ido_mysql/idomysqlconnection.cpp
@@ -381,9 +381,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) {