From 3d8586ccec4b32fe415c2c32ad881d78d0e1aef2 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Tue, 20 Apr 2021 19:04:49 +0200 Subject: [PATCH] Ido*Connection: extend IsPaused() check where the difference matters refs #8727 --- lib/db_ido_mysql/idomysqlconnection.cpp | 6 +++--- lib/db_ido_pgsql/idopgsqlconnection.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/db_ido_mysql/idomysqlconnection.cpp b/lib/db_ido_mysql/idomysqlconnection.cpp index 1f379489f..08d427426 100644 --- a/lib/db_ido_mysql/idomysqlconnection.cpp +++ b/lib/db_ido_mysql/idomysqlconnection.cpp @@ -147,7 +147,7 @@ void IdoMysqlConnection::Disconnect() void IdoMysqlConnection::NewTransaction() { - if (IsPaused()) + if (IsPaused() && GetPauseCalled()) return; #ifdef I2_DEBUG /* I2_DEBUG */ @@ -898,7 +898,7 @@ bool IdoMysqlConnection::FieldToEscapedString(const String& key, const Value& va void IdoMysqlConnection::ExecuteQuery(const DbQuery& query) { - if (IsPaused()) + if (IsPaused() && GetPauseCalled()) return; ASSERT(query.Category != DbCatInvalid); @@ -1001,7 +1001,7 @@ void IdoMysqlConnection::InternalExecuteQuery(const DbQuery& query, int typeOver { AssertOnWorkQueue(); - if (IsPaused()) { + if (IsPaused() && GetPauseCalled()) { DecreasePendingQueries(1); return; } diff --git a/lib/db_ido_pgsql/idopgsqlconnection.cpp b/lib/db_ido_pgsql/idopgsqlconnection.cpp index 5bc323335..5e8d6900f 100644 --- a/lib/db_ido_pgsql/idopgsqlconnection.cpp +++ b/lib/db_ido_pgsql/idopgsqlconnection.cpp @@ -713,7 +713,7 @@ bool IdoPgsqlConnection::FieldToEscapedString(const String& key, const Value& va void IdoPgsqlConnection::ExecuteQuery(const DbQuery& query) { - if (IsPaused()) + if (IsPaused() && GetPauseCalled()) return; ASSERT(query.Category != DbCatInvalid); @@ -798,7 +798,7 @@ void IdoPgsqlConnection::InternalExecuteQuery(const DbQuery& query, int typeOver { AssertOnWorkQueue(); - if (IsPaused()) { + if (IsPaused() && GetPauseCalled()) { DecreasePendingQueries(1); return; }