Georg Richter 74e62c2892 Merge remote-tracking branch 'origin/master' into cio ...

Conflicts:
	CMakeLists.txt
	include/mysql/client_plugin.h
	libmariadb/client_plugin.c.in
	libmariadb/libmariadb.c
	libmariadb/ma_secure.c
	libmariadb/my_malloc.c
	libmariadb/net.c
	plugins/io/CMakeLists.txt
	unittest/libmariadb/misc.c

2015-10-02 12:28:54 +02:00

..

client_plugin.h

Merge remote-tracking branch 'origin/master' into cio

2015-10-02 12:28:54 +02:00

plugin_auth_common.h

Fixes for Win64 build

2013-10-10 15:14:15 +02:00

plugin_auth.h

some clean up

2012-12-16 12:05:40 +01:00