Markus Makela 6497350ab7 Merge branch 'release-1.2' into develop ...

Conflicts:
	server/core/adminusers.c
	server/modules/protocol/mysql_client.c

2015-07-11 17:12:48 +03:00

..

core

Merge branch 'release-1.2' into develop

2015-07-11 17:12:48 +03:00

include

Merged dcb_read and dcb_read_n into a single function (dcb_read with an extra parameter).

2015-07-10 15:12:22 +01:00

inih

Revert "MXS-117: https://mariadb.atlassian.net/browse/MXS-117"

2015-04-24 17:57:41 +03:00

modules

Merge branch 'release-1.2' into develop

2015-07-11 17:12:48 +03:00

test

Fixed the test header configuration failing.

2015-06-26 13:35:14 +03:00

CMakeLists.txt

Fixed CMake builds overwriting MaxScale.cnf when installing after tests were built.

2014-10-14 19:15:59 +03:00

maxscale_binlogserver_template.cnf

Changed relevant files to use get_cachedir() instead of using the now deprecated MAXSCALE_HOME.

2015-04-27 21:55:57 +03:00

maxscale_template.cnf

Added template cnf file to /etc and renamed folders.

2015-07-09 14:41:23 +03:00