Mark Riddoch d3c8770852 Merge branch 'blr' into develop ...

Conflicts:
	client/maxadmin.c
	server/core/CMakeLists.txt
	server/core/dcb.c
	server/core/gateway.c
	server/core/poll.c
	server/core/test/CMakeLists.txt
	server/core/test/makefile
	server/include/poll.h
	server/modules/routing/debugcmd.c

2014-11-19 12:00:55 +00:00

..

blr.h

Merge branch 'blr' into develop

2014-11-19 12:00:55 +00:00

debugcli.h

Updated the licensing year from 2013 to 2013-2014

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

httpd.h

Updated the licensing year from 2013 to 2013-2014

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

maxscaled.h

Renamed all occurences of SkySQL to MariaDB Corporation

2014-09-30 13:02:10 +03:00

mysql_client_server_protocol.h

Fix to #601, http://bugs.skysql.com/show_bug.cgi?id=601

2014-11-13 17:55:29 +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

Made RWSplit to use slave selection criteria also during client session. Previously the criteria was use when slaves were selected for use of client session.

2014-11-17 13:40:18 +02:00

telnetd.h

Updated the licensing year from 2013 to 2013-2014

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