Mark Riddoch a655e394ac Merge branch 'blr' into release-1.0GA ...

Conflicts:
	server/core/service.c

2014-12-16 15:44:19 +00:00

..

blr.h

Improved error messages

2014-12-16 10:38:09 +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

Fixes to Coverity issues 84388, 84386, 84385

2014-12-05 23:39:14 +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

Complete fix candidate for #645, http://bugs.skysql.com/show_bug.cgi?id=645 and #648, http://bugs.skysql.com/show_bug.cgi?id=648

2014-12-14 11:26:15 +02:00

telnetd.h

Updated the licensing year from 2013 to 2013-2014

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