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

..

blr.h

Improved diagnostics

2014-06-07 21:01:11 +01:00

debugcli.h

Addition of developer and user modes to debugcli

2014-05-23 13:29:58 +01:00

httpd.h

Modified comments to be compatible with doxygen

2013-12-13 19:32:10 +02:00

mysql_client_server_protocol.h

Manual merge from master to develop. Incliding fix for bug #425 http://bugs.skysql.com/show_bug.cgi?id=425

2014-05-21 15:41:39 +03:00

readconnection.h

Router has now capability value which currently tells whether router session expects stream or individual, complete statements. With read con

2014-03-11 23:12:11 +02:00

readwritesplit.h

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

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

telnetd.h

moving files to /server to make merge possible

2013-07-28 05:31:11 +00:00