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

Fix transaction tracking

Browse Source 
If autocommit is disables, a transaction will always be open.
This commit is contained in:
Markus Makela
2016-12-05 23:38:03 +02:00
parent 9731bca42e
commit fcbea9fa40
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1450,8 +1450,10 @@ static int route_by_statement(SESSION* session, uint64_t capabilities, GWBUF** p
{ {
if (type & QUERY_TYPE_DISABLE_AUTOCOMMIT) if (type & QUERY_TYPE_DISABLE_AUTOCOMMIT)
{ {
/** Autocommit is disabled, a transaction will
* always be open */
session_set_autocommit(session, false); session_set_autocommit(session, false);
session_set_trx_state(session, SESSION_TRX_INACTIVE); session_set_trx_state(session, SESSION_TRX_ACTIVE);
} }
else else
{ {
@ -1474,7 +1476,13 @@ static int route_by_statement(SESSION* session, uint64_t capabilities, GWBUF** p
} }
else if ((type & QUERY_TYPE_COMMIT) || (type & QUERY_TYPE_ROLLBACK)) 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) if (type & QUERY_TYPE_ENABLE_AUTOCOMMIT)
{ {