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

..

blr.h

Merge branch 'blr' into develop

2015-02-09 20:58:55 +00:00

debugcli.h

New fix candidate to bug #698, http://bugs.mariadb.com/show_bug.cgi?id=698

2015-01-19 17:55:02 +02:00

httpd.h

Updated the licensing year from 2013 to 2013-2014

2014-10-01 14:37:12 +03:00

maxinfo.h

Added basic REST interface to maxinfo plugin

2015-02-19 16:24:30 +00:00

maxscaled.h

Added session timeouts.

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

mysql_client_server_protocol.h

Added session timeouts.

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

mysqlhint.h

Updated the licensing year from 2013 to 2013-2014

2014-10-01 14:37:12 +03:00

readconnection.h

Updated the licensing year from 2013 to 2013-2014

2014-10-01 14:37:12 +03:00

readwritesplit.h

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

2015-03-01 02:27:47 +02:00

telnetd.h

Added session timeouts.

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