4 files changed, 38 insertions, 20 deletions

diff --git a/databases/mariadb-server/Makefile b/databases/mariadb-server/Makefile
index 70e98e46f7c7..a92e3e0c27b8 100644
--- a/databases/mariadb-server/Makefile
+++ b/databases/mariadb-server/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	mariadb
-PORTVERSION=	5.2.10
+PORTVERSION=	5.3.6
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://www.percona.com/downloads/MariaDB/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
@@ -33,7 +33,7 @@ GNU_CONFIGURE=	yes
 
 .if !defined(MARIADB_CLIENT_SLAVE)
 USE_MYSQL=	yes
-WANT_MYSQL_VER=	52
+WANT_MYSQL_VER=	53
 .endif
 
 .if !defined(MARIADB_SCRIPTS_SLAVE)
@@ -77,6 +77,7 @@ OPTIONS+=	ARIADB "Aria storage engine" On \
 		OQGRAPH "Open Query Graph Computation engine" Off \
 		PBXT "MVCC-based transactional engine" Off \
 		PARTITION "Partitioning support" Off \
+		HANDLERSOCKET "HandlerSocket support" On \
 		NDB "Enable NDB support (implies PARTITION)" Off \
 		EXAMPLES "Example engine,daemon and ftsearch plugins" Off
 .endif	# .if !defined(MARIADB_CLIENT_SLAVE)
@@ -169,6 +170,13 @@ PLUGINS+=	xtradb
 CONFIGURE_ARGS+=	--without-plugin-xtradb
 PLIST_SUB+=	XTRADB="@comment "
 .endif
+.if defined(WITH_HANDLERSOCKET)
+PLIST_SUB+=	HANDLERSOCKET=""
+PLUGINS+=	handlersocket
+.else
+CONFIGURE_ARGS+=	--without-plugin-handlersocket
+PLIST_SUB+=     HANDLERSOCKET="@comment "
+.endif
 .if defined(WITH_OQGRAPH)
 CONFIGURE_ARGS+=	--with-plugin-oqgraph
 PLIST_SUB+=	OQGRAPH=""
diff --git a/databases/mariadb-server/distinfo b/databases/mariadb-server/distinfo
index b905cfca8e5a..998ef5fe0081 100644
--- a/databases/mariadb-server/distinfo
+++ b/databases/mariadb-server/distinfo
@@ -1,2 +1,2 @@
-SIZE (mariadb-5.2.10.tar.gz) = 25242675
-SHA256 (mariadb-5.2.10.tar.gz) = dbcbd4f627fa7a045094fe5e1b0d27201966937d0135e54ca892fb5ab912d7b3
+SIZE (mariadb-5.3.6.tar.gz) = 26724631
+SHA256 (mariadb-5.3.6.tar.gz) = 899410ef19981d9be3c293f57fbceffc88487ccbd6ebcb02a8c14831c918e040
diff --git a/databases/mariadb-server/files/patch-plugin__auth_pam__auth_pam.c b/databases/mariadb-server/files/patch-plugin__auth_pam__auth_pam.c
deleted file mode 100644
index 4a0ab89f82ea..000000000000
--- a/databases/mariadb-server/files/patch-plugin__auth_pam__auth_pam.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugin/auth_pam/auth_pam.c.orig	2012-01-04 14:17:30.000000000 +0100
-+++ plugin/auth_pam/auth_pam.c	2012-01-04 14:17:36.000000000 +0100
-@@ -1,7 +1,6 @@
- #include <mysql/plugin_auth.h>
- #include <string.h>
- #include <security/pam_appl.h>
--#include <security/pam_modules.h>
- 
- struct param {
-   unsigned char buf[10240], *ptr;
diff --git a/databases/mariadb-server/pkg-plist b/databases/mariadb-server/pkg-plist
index b0d6737572ac..1e8308fce62c 100644
--- a/databases/mariadb-server/pkg-plist
+++ b/databases/mariadb-server/pkg-plist
@@ -10,6 +10,8 @@ bin/myisam_ftdump
 bin/myisamchk
 bin/myisamlog
 bin/myisampack
+bin/mytop
+%%HANDLERSOCKET%%bin/hsclient
 bin/mysql_client_test_embedded
 bin/mysql_convert_table_format
 bin/mysql_find_rows
@@ -48,6 +50,22 @@ bin/replace
 bin/resolve_stack_dump
 bin/resolveip
 %%PBXT%%bin/xtstat
+%%HANDLERSOCKET%%include/handlersocket/allocator.hpp
+%%HANDLERSOCKET%%include/handlersocket/config.hpp
+%%HANDLERSOCKET%%include/handlersocket/mutex.hpp
+%%HANDLERSOCKET%%include/handlersocket/string_util.hpp
+%%HANDLERSOCKET%%include/handlersocket/auto_addrinfo.hpp
+%%HANDLERSOCKET%%include/handlersocket/escape.hpp
+%%HANDLERSOCKET%%include/handlersocket/socket.hpp
+%%HANDLERSOCKET%%include/handlersocket/thread.hpp
+%%HANDLERSOCKET%%include/handlersocket/auto_file.hpp
+%%HANDLERSOCKET%%include/handlersocket/fatal.hpp
+%%HANDLERSOCKET%%include/handlersocket/string_buffer.hpp
+%%HANDLERSOCKET%%include/handlersocket/util.hpp
+%%HANDLERSOCKET%%include/handlersocket/auto_ptrcontainer.hpp
+%%HANDLERSOCKET%%include/handlersocket/hstcpcli.hpp
+%%HANDLERSOCKET%%include/handlersocket/string_ref.hpp
+%%HANDLERSOCKET%%@dirrm include/handlersocket
 %%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi.h
 %%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_config_parameters.h
 %%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_config_parameters_debug.h
@@ -80,6 +98,10 @@ bin/resolveip
 %%NDB%%include/mysql/storage/ndb/ndbapi/ndbapi_limits.h
 %%NDB%%include/mysql/storage/ndb/ndbapi/ndberror.h
 %%ARIADB%%lib/mysql/libaria.a
+%%HANDLERSOCKET%%lib/libhsclient.so.0
+%%HANDLERSOCKET%%lib/libhsclient.so
+%%HANDLERSOCKET%%lib/libhsclient.la
+%%HANDLERSOCKET%%lib/libhsclient.a
 lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmyisam.a
@@ -96,7 +118,10 @@ lib/mysql/libmysys.a
 %%NDB%%lib/mysql/libndbclient.so
 %%NDB%%lib/mysql/libndbclient.so.3
 lib/mysql/libvio.a
-%%STATIC%%lib/mysql/plugin/auth_pam.a
+%%HANDLERSOCKET%%lib/mysql/plugin/handlersocket.so.0
+%%HANDLERSOCKET%%lib/mysql/plugin/handlersocket.so
+%%HANDLERSOCKET%%lib/mysql/plugin/handlersocket.la
+%%HANDLERSOCKET%%lib/mysql/plugin/handlersocket.a
 %%STATIC%%lib/mysql/plugin/auth_pam.la
 %%STATIC%%lib/mysql/plugin/auth_pam.so
 %%STATIC%%lib/mysql/plugin/auth_pam.so.0
@@ -104,15 +129,12 @@ lib/mysql/libvio.a
 %%STATIC%%lib/mysql/plugin/dialog.la
 %%STATIC%%lib/mysql/plugin/dialog.so
 %%STATIC%%lib/mysql/plugin/dialog.so.0
-%%STATIC%%lib/mysql/plugin/feedback.a
 %%STATIC%%lib/mysql/plugin/feedback.la
 %%STATIC%%lib/mysql/plugin/feedback.so
 %%STATIC%%lib/mysql/plugin/feedback.so.0
-%%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.a
 %%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.la
 %%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.so
 %%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.so.0
-%%STATIC%%%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.a
 %%STATIC%%%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.la
 %%STATIC%%%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.so
 %%STATIC%%%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.so.0
@@ -132,7 +154,6 @@ lib/mysql/libvio.a
 %%STATIC%%%%FEDERATED%%lib/mysql/plugin/ha_federated.la
 %%STATIC%%%%FEDERATED%%lib/mysql/plugin/ha_federated.so
 %%STATIC%%%%FEDERATED%%lib/mysql/plugin/ha_federated.so.0
-%%STATIC%%%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.a
 %%STATIC%%%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.la
 %%STATIC%%%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.so
 %%STATIC%%%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.so.0
@@ -151,7 +172,6 @@ lib/mysql/libvio.a
 %%SPHINX%%lib/mysql/plugin/sphinx.la
 %%SPHINX%%lib/mysql/plugin/sphinx.so
 %%SPHINX%%lib/mysql/plugin/sphinx.so.0
-%%STATIC%%%%XTRADB%%lib/mysql/plugin/ha_xtradb.a
 %%STATIC%%%%XTRADB%%lib/mysql/plugin/ha_xtradb.la
 %%STATIC%%%%XTRADB%%lib/mysql/plugin/ha_xtradb.so
 %%STATIC%%%%XTRADB%%lib/mysql/plugin/ha_xtradb.so.0