From fce48282ad25612f61e396a066eb486b55de1c1f Mon Sep 17 00:00:00 2001 From: Ambal Date: Fri, 21 Jan 2011 23:45:54 +0200 Subject: [PATCH] [11061] Bring 'autocommit' mode for MySQL back. This MySQL feature operates in so frustrating way so it is better to keep it ALWAYS ENABLED!!! Signed-off-by: Ambal --- src/shared/Database/Database.cpp | 5 +---- src/shared/Database/DatabaseMysql.cpp | 10 +++++----- src/shared/revision_nr.h | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/shared/Database/Database.cpp b/src/shared/Database/Database.cpp index d545e6db4..68f6b1e58 100644 --- a/src/shared/Database/Database.cpp +++ b/src/shared/Database/Database.cpp @@ -283,10 +283,7 @@ bool Database::Execute(const char *sql) return DirectExecute(sql); // Simple sql statement - pTrans = new SqlTransaction; - pTrans->DelayExecute(sql); - - m_threadBody->Delay(pTrans); + m_threadBody->Delay(new SqlStatement(sql)); } return true; diff --git a/src/shared/Database/DatabaseMysql.cpp b/src/shared/Database/DatabaseMysql.cpp index 34e6b9af2..d5988e12a 100644 --- a/src/shared/Database/DatabaseMysql.cpp +++ b/src/shared/Database/DatabaseMysql.cpp @@ -152,12 +152,12 @@ bool MySQLConnection::Initialize(const char *infoString) // autocommit is turned of during it. // Setting it to on makes atomic updates work // --- - // if you want atomic updates to work - USE TRANSACTIONS!!! - // no need to mess up with autocommit mode which might degrade server performance! - if (!mysql_autocommit(mMysql, 0)) - DETAIL_LOG("AUTOCOMMIT SUCCESSFULLY SET TO 0"); + // LEAVE 'AUTOCOMMIT' MODE ALWAYS ENABLED!!! + // W/O IT EVEN 'SELECT' QUERIES WOULD REQUIRE TO BE WRAPPED INTO 'START TRANSACTION'<>'COMMIT' CLAUSES!!! + if (!mysql_autocommit(mMysql, 1)) + DETAIL_LOG("AUTOCOMMIT SUCCESSFULLY SET TO 1"); else - DETAIL_LOG("AUTOCOMMIT NOT SET TO 0"); + DETAIL_LOG("AUTOCOMMIT NOT SET TO 1"); /*-------------------------------------*/ // set connection properties to UTF8 to properly handle locales for different diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index a557f6497..328b8665b 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11060" + #define REVISION_NR "11061" #endif // __REVISION_NR_H__