root 61c47375d5 Merge branch 'develop' into 1.2.1-binlog_router ...

Conflicts:
	server/core/server.c
	server/include/server.h
	server/modules/include/blr.h
	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

2015-08-04 07:59:44 -04:00

..

filter

Fixed possible division by zero error.

2015-07-24 17:19:57 +03:00

include

Merge branch 'develop' into 1.2.1-binlog_router

2015-08-04 07:59:44 -04:00

monitor

Fix memory leak in MySQL monitor.

2015-07-19 16:54:13 +01:00

protocol

Fixed TCP_NODELAY being applied to sockets.

2015-07-23 17:59:48 +03:00

routing

Merge branch 'develop' into 1.2.1-binlog_router

2015-08-04 07:59:44 -04:00

CMakeLists.txt

initial implementation of the CMake build system

2014-09-11 18:24:41 +03:00