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

Browse Source

Conflicts:
	server/core/session.c
	server/modules/protocol/mysql_backend.c
	server/modules/routing/readwritesplit/readwritesplit.c

Resolved.

Addition of user in topfilter report and general tidyup

...

This commit is contained in:

Mark Riddoch

2014-06-18 17:45:57 +01:00

parent 9f6a1061c6 3def4c1c73

commit 4d257897d3

35 changed files with 2005 additions and 854 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

848

server/modules/routing/readwritesplit/readwritesplit.c

File diff suppressed because it is too large Load Diff