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

..

test

remove makefiles and other garbage

2015-01-14 19:08:24 +02:00

CMakeLists.txt

Updated more variables.

2015-04-26 20:08:27 +03:00

readwritesplit.c

Merge branch 'release-1.2' into develop

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