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

Added comments to SSL tests.

2015-06-04 16:49:39 +03:00

CMakeLists.txt

Added unit tests for SSL.

2015-06-03 13:15:45 +03:00

httpd.c

Finalise comments; change abort from assert(false) to raise(SIGABRT).

2015-07-07 16:57:13 +01:00

maxscaled.c

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

mysql_backend.c

Merge branch 'release-1.2' into develop

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

mysql_client.c

Merge branch 'release-1.2' into develop

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

mysql_common.c

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

telnetd.c

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

testprotocol.c

Fix to bug 579: http://bugs.mariadb.com/show_bug.cgi?id=579

2015-02-20 12:30:55 +02:00