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

Merge branch 'blr' into release-1.0GA

Browse Source 
Conflicts:
	server/modules/protocol/mysql_backend.c
	server/modules/routing/binlog/blr_master.c
This commit is contained in:
Mark Riddoch
2014-12-05 11:42:02 +00:00
parent 2b998eb17f 863a30c969
commit e102d56e69
7 changed files with 483 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/modules/protocol/mysql_backend.c
View File

@ -963,18 +963,18 @@ static int gw_create_backend_connection(
/** Copy client flags to backend protocol */
if (backend_dcb->session->client->protocol)
{
{
/** Copy client flags to backend protocol */
protocol->client_capabilities =
((MySQLProtocol *)(backend_dcb->session->client->protocol))->client_capabilities;
/** Copy client charset to backend protocol */
/** Copy client charset to backend protocol */
protocol->charset =
((MySQLProtocol *)(backend_dcb->session->client->protocol))->charset;
((MySQLProtocol *)(backend_dcb->session->client->protocol))->charset;
}
else
{
protocol->client_capabilities = GW_MYSQL_CAPABILITIES_PROTOCOL_41|
GW_MYSQL_CAPABILITIES_CLIENT;
protocol->charset = 33;
protocol->client_capabilities = GW_MYSQL_CAPABILITIES_CLIENT;
protocol->charset = 0x08;
}
/*< if succeed, fd > 0, -1 otherwise */