hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve transaction tracking fix

Browse Source 
The previous fix can be implemented with less changes to actual code.
This commit is contained in:
Markus Makela
2016-12-07 10:08:26 +02:00
parent 6f7f8cae39
commit 8d539d9afb
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/modules/protocol/MySQL/MySQLClient/mysql_client.c
View File

@ -1450,10 +1450,8 @@ static int route_by_statement(SESSION* session, uint64_t capabilities, GWBUF** p
{
if (type & QUERY_TYPE_DISABLE_AUTOCOMMIT)
{
/** Autocommit is disabled, a transaction will
* always be open */
session_set_autocommit(session, false);
session_set_trx_state(session, SESSION_TRX_ACTIVE);
session_set_trx_state(session, SESSION_TRX_INACTIVE);
}
else
{
@ -1476,13 +1474,7 @@ static int route_by_statement(SESSION* session, uint64_t capabilities, GWBUF** p
}
else if ((type & QUERY_TYPE_COMMIT) || (type & QUERY_TYPE_ROLLBACK))
{
if (session_is_autocommit(session) ||
(type & QUERY_TYPE_ENABLE_AUTOCOMMIT))
{
/** Autocommit is either on or being enabled
* and both of these cause an implicit commit */
session_set_trx_state(session, SESSION_TRX_INACTIVE);
}
session_set_trx_state(session, SESSION_TRX_INACTIVE);
if (type & QUERY_TYPE_ENABLE_AUTOCOMMIT)
{