Markus Makela db1ea422a0 Merge branch 'develop' into MAX-324 ...

Conflicts:
	server/core/modutil.c

2015-01-20 04:25:40 +02:00

..

blr.h

Improved error messages

2014-12-16 10:38:09 +00:00

dbshard.h

Commented out old code and fixed a memory leak.

2015-01-16 07:41:10 +02: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

maxscaled.h

Renamed all occurences of SkySQL to MariaDB Corporation

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

mysql_client_server_protocol.h

Merge branch 'release-1.0GA' into MAX-324

2015-01-06 04:45:30 +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

dcb.b:dcb_final_free:replaced ((dcb->flags & DCBF_CLONE)==0) with macro !DCB_IS_CLONE(dcb)

2014-12-23 16:10:27 +02:00

telnetd.h

Updated the licensing year from 2013 to 2013-2014

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