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

..

blr.h

Merge branch 'develop' into 1.2.1-binlog_router

2015-08-04 07:59:44 -04: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

Fix mistake in testing for null password; add contents with links to MaxAdmin reference guide.

2015-06-24 21:44:02 +01: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

MXS-171: https://mariadb.atlassian.net/browse/MXS-171

2015-06-24 19:23:43 +03:00

schemarouter.h

Added more statistics to schemarouter diagnostics.

2015-04-23 21:00:52 +03:00

sharding_common.h

Moved common sharding functions to a separate file.

2015-05-06 11:59:12 +03:00

shardrouter.h

Resolve compiler warnings

2015-07-08 11:35:41 +01:00

telnetd.h

Added session timeouts.

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