Merge branch 'SESvars' of https://github.com/skysql/MaxScale into SESvars

Browse Source

Conflicts:
	server/core/dcb.c
	server/core/poll.c
	server/modules/include/mysql_client_server_protocol.h
	server/modules/routing/readwritesplit/readwritesplit.c

...

This commit is contained in:

VilhoRaatikka

2014-03-18 10:28:06 +02:00

parent 1926181119 67d9b3afb9

commit c356b396a6

19 changed files with 1667 additions and 403 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1319

server/modules/routing/readwritesplit/readwritesplit.c

File diff suppressed because it is too large Load Diff