Mark Riddoch fda9b1c706 Merge branch 'develop' into blr ...

Conflicts:
	server/core/dcb.c
	server/modules/include/blr.h
	server/modules/routing/binlog/STATUS
	server/modules/routing/binlog/blr.c
	server/modules/routing/binlog/blr_file.c
	server/modules/routing/binlog/blr_master.c
	server/modules/routing/binlog/blr_slave.c

2014-06-08 00:50:36 +01:00

..

binlog

Merge branch 'develop' into blr

2014-06-08 00:50:36 +01:00

readwritesplit

Removed references to SERVER_IS_JOINED status from readwritesplit.c because rwsplit for Galera doesn't use that status at all.

2014-06-04 14:49:05 +03:00

test

Added default value for max_slave_connections=1. It is set when router instance is created. Default value is overwritten if configuration parameter is found.

2014-05-10 23:27:28 +03:00

.gitignore

Updated gitignore files

2014-02-05 14:49:05 +01:00

debugcli.c

Addition of the module info structure to allow module information to

2014-06-02 17:10:05 +01:00

debugcmd.c

Updates to debug CLI

2014-06-07 20:41:58 +01:00

GaleraHACRoute.c

Galera HA Connection Router

2014-03-28 14:48:21 +00:00

Makefile

Merge branch 'develop' into blr

2014-06-08 00:50:36 +01:00

readconnroute.c

Bug #443, http://bugs.skysql.com/show_bug.cgi?id=443

2014-06-03 19:39:50 +03:00

testroute.c

Addition of the module info structure to allow module information to

2014-06-02 17:10:05 +01:00