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

Merge branch 'Z3' into Z3_rabbit_partial

Browse Source 
Conflicts:
	server/modules/routing/readwritesplit/readwritesplit.c
This commit is contained in:
Markus Makela
2014-09-04 13:40:26 +03:00
parent 4e11ea9b06 0630b2ff46
commit c00e51fd00
6 changed files with 52 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/include/mysql_client_server_protocol.h
View File

@ -219,7 +219,7 @@ typedef enum mysql_server_cmd {
MYSQL_COM_QUERY,
MYSQL_COM_FIELD_LIST,
MYSQL_COM_CREATE_DB,
MYSQL_COM_DROP_DB,
MYSQL_COM_DROP_DB,
MYSQL_COM_REFRESH,
MYSQL_COM_SHUTDOWN,
MYSQL_COM_STATISTICS,

8
server/modules/routing/readwritesplit/readwritesplit.c
View File

@ -1607,10 +1607,10 @@ static int routeQuery(
check_drop_tmp_table(instance,router_session,querybuf,qtype);
/**
* If autocommit is disabled or transaction is explicitly started
* transaction becomes active and master gets all statements until
* transaction is committed and autocommit is enabled again.
*/
* If autocommit is disabled or transaction is explicitly started
* transaction becomes active and master gets all statements until
* transaction is committed and autocommit is enabled again.
*/
if (router_cli_ses->rses_autocommit_enabled &&
QUERY_IS_TYPE(qtype, QUERY_TYPE_DISABLE_AUTOCOMMIT))
{