Mark Riddoch e102d56e69 Merge branch 'blr' into release-1.0GA ...

Conflicts:
	server/modules/protocol/mysql_backend.c
	server/modules/routing/binlog/blr_master.c

2014-12-05 11:42:02 +00:00

..

filter

Use strtok_r rather than strtok

2014-12-03 09:33:55 +00:00

include

Merge branch 'blr' into release-1.0GA

2014-12-05 11:42:02 +00:00

monitor

Skip log for "Master available" with MAINTENANCE

2014-12-04 15:25:04 +01:00

protocol

Merge branch 'blr' into release-1.0GA

2014-12-05 11:42:02 +00:00

routing

Merge branch 'blr' into release-1.0GA

2014-12-05 11:42:02 +00:00

CMakeLists.txt

initial implementation of the CMake build system

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