Markus Makela 1b0fd4576a Merge branch 'maxinfo' into develop ...

Conflicts:
	server/core/service.c
	server/core/session.c
	server/include/session.h

2015-03-04 11:33:00 +02:00

..

CMakeLists.txt

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

2015-02-20 12:30:55 +02:00

httpd.c

Make JSON result sets produce nmeric valeus without quotes

2015-02-20 10:09:01 +00:00

maxscaled.c

Moved the housekeeper heartbeat to a separate header for ease of integration.

2015-02-24 05:00:16 +02:00

mysql_backend.c

Fix to NULL dcb in mysql_backend.c

2015-02-25 12:10:33 +02:00

mysql_client.c

Moved the housekeeper heartbeat to a separate header for ease of integration.

2015-02-24 05:00:16 +02:00

mysql_common.c

Added session timeouts.

2015-02-20 22:16:43 +02:00

telnetd.c

Moved the housekeeper heartbeat to a separate header for ease of integration.

2015-02-24 05:00:16 +02:00

testprotocol.c

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

2015-02-20 12:30:55 +02:00