Markus Makela 9e7afeb302 Merge branch 'develop' into MAX-324 ...

Conflicts:
	macros.cmake
	server/core/config.c
	server/core/service.c
	server/modules/routing/CMakeLists.txt

2015-02-24 06:26:55 +02:00

..

CMakeLists.txt

Removed unnecessary linking commands to libmysqld.a

2014-10-01 13:29:26 +03:00

galera_mon.c

Updated galera monitor to use the new dcb_callforeach.

2015-02-20 10:18:24 +02:00

mm_mon.c

Fixed compile errors for mm_mon.c

2015-02-23 18:58:00 +01:00

mysql_mon.c

dcb_call_foreach now only calls the callbacks for those DCBs that are connected to the server.

2015-02-18 05:36:39 +02:00

mysqlmon.h

Addition of timeout for connect,read,write

2014-11-10 15:13:26 +01:00

ndbcluster_mon.c

Fix to bug 705: http://bugs.mariadb.com/show_bug.cgi?id=705

2015-01-26 20:17:20 +02:00