Mark Riddoch 63252e94f2 Merge branch 'release-1.0beta-refresh' into blr ...

Fix conflict and remove some redundant code

Conflicts:
	server/core/poll.c

2014-09-24 16:49:12 +01:00

..

binlog

Merge branch 'release-1.0beta-refresh' into blr

2014-09-24 16:49:12 +01:00

readwritesplit

Changed the order of linking to resolve some debug build bugs and added the missing parent directory of the MYSQL_DIR into the included directories.

2014-09-20 19:44:30 +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

cli.c

Update plugin status to BETA

2014-07-04 09:23:40 +01:00

CMakeLists.txt

Changed the order of linking to resolve some debug build bugs and added the missing parent directory of the MYSQL_DIR into the included directories.

2014-09-20 19:44:30 +03:00

debugcli.c

Update plugin status to BETA

2014-07-04 09:23:40 +01:00

debugcmd.c

Merge from Z3

2014-09-11 12:51:16 +02:00

GaleraHACRoute.c

When protocol closes DCB it calls dcb_close instead of dcb->func.close. dcb_close then calls dcb->func.close. This is now changed to all protocols and routers.

2014-06-15 23:44:07 +03:00

Makefile

Add binlogrouter back into Makefile following merge

2014-09-16 14:28:47 +01:00

readconnroute.c

Fix for zero wieght in readconnrouter

2014-09-15 14:53:08 +01:00

testroute.c

Addition of the module info structure to allow module information to

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

webserver.c

Added some documentation

2014-07-16 16:11:27 +01:00