databases/mariadb101-{server,client}: Update to 10.1.14

  - Update to version 10.1.14
  - Remove fix for MDEV-9529
  - Add new header files
  - Add new MySQL to MariaDB migration script

3 files changed, 64 insertions, 5 deletions

diff --git a/databases/mariadb101-server/Makefile b/databases/mariadb101-server/Makefile
index 8b354c8e9204..0f372485ec37 100644
--- a/databases/mariadb101-server/Makefile
+++ b/databases/mariadb101-server/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.1.13
+PORTVERSION=	10.1.14
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://ftp.osuosl.org/pub/${SITESDIR}/ \
 		http://mirrors.supportex.net/${SITESDIR}/ \
@@ -142,8 +142,6 @@ post-install:
 		${STAGEDIR}${PREFIX}/bin/mysqlaccess
 	${RM} -r ${STAGEDIR}/${PREFIX}/share/mysql/policy \
 		${STAGEDIR}/${PREFIX}/share/pkgconfig
-# See https://mariadb.atlassian.net/browse/MDEV-9529
-	${RM} ${STAGEDIR}/${PREFIX}/bin/maria_add_gis_sp.sql
 .endif # defined(CLIENT_ONLY)
 
 .if defined(WITH_OPENSSL_PORT)
diff --git a/databases/mariadb101-server/distinfo b/databases/mariadb101-server/distinfo
index 5d9504541eef..bf795b2cb47f 100644
--- a/databases/mariadb101-server/distinfo
+++ b/databases/mariadb101-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mariadb-10.1.13.tar.gz) = 21e1c7da1421146c69f5e8077333aaac06778a87046a1943ee4f449fbcefc00d
-SIZE (mariadb-10.1.13.tar.gz) = 55272572
+SHA256 (mariadb-10.1.14.tar.gz) = 18e71974a059a268a3f28281599607344d548714ade823d575576121f76ada13
+SIZE (mariadb-10.1.14.tar.gz) = 55341017
diff --git a/databases/mariadb101-server/pkg-plist b/databases/mariadb101-server/pkg-plist
index fc1c020f1509..622ab46de52f 100644
--- a/databases/mariadb101-server/pkg-plist
+++ b/databases/mariadb101-server/pkg-plist
@@ -40,7 +40,67 @@ bin/wsrep_sst_mysqldump
 bin/wsrep_sst_rsync
 bin/wsrep_sst_xtrabackup
 bin/wsrep_sst_xtrabackup-v2
+include/mysql/private/atomic/gcc_builtins.h
+include/mysql/private/atomic/generic-msvc.h
+include/mysql/private/atomic/nolock.h
+include/mysql/private/atomic/solaris.h
+include/mysql/private/atomic/x86-gcc.h
+include/mysql/private/base64.h
+include/mysql/private/config.h
+include/mysql/private/ft_global.h
 include/mysql/private/embedded_priv.h
+include/mysql/private/hash.h
+include/mysql/private/heap.h
+include/mysql/private/lf.h
+include/mysql/private/maria.h
+include/mysql/private/my_alarm.h
+include/mysql/private/my_atomic.h
+include/mysql/private/my_base.h
+include/mysql/private/my_bit.h
+include/mysql/private/my_bitmap.h
+include/mysql/private/my_check_opt.h
+include/mysql/private/my_compare.h
+include/mysql/private/my_context.h
+include/mysql/private/my_cpu.h
+include/mysql/private/my_crypt.h
+include/mysql/private/my_default.h
+include/mysql/private/my_handler_errors.h
+include/mysql/private/my_libwrap.h
+include/mysql/private/my_md5.h
+include/mysql/private/my_nosys.h
+include/mysql/private/my_rdtsc.h
+include/mysql/private/my_rnd.h
+include/mysql/private/my_stacktrace.h
+include/mysql/private/my_systemd.h
+include/mysql/private/my_time.h
+include/mysql/private/my_tree.h
+include/mysql/private/my_uctype.h
+include/mysql/private/my_user.h
+include/mysql/private/myisam.h
+include/mysql/private/myisamchk.h
+include/mysql/private/myisammrg.h
+include/mysql/private/myisampack.h
+include/mysql/private/mysql_async.h
+include/mysql/private/mysqld_default_groups.h
+include/mysql/private/mysys_err.h
+include/mysql/private/password.h
+include/mysql/private/probes_mysql.h
+include/mysql/private/probes_mysql_nodtrace.h
+include/mysql/private/queues.h
+include/mysql/private/rijndael.h
+include/mysql/private/service_versions.h
+include/mysql/private/sha1.h
+include/mysql/private/sha2.h
+include/mysql/private/t_ctype.h
+include/mysql/private/thr_alarm.h
+include/mysql/private/thr_lock.h
+include/mysql/private/thr_timer.h
+include/mysql/private/thread_pool_priv.h
+include/mysql/private/violite.h
+include/mysql/private/waiting_threads.h
+include/mysql/private/welcome_copyright_notice.h
+include/mysql/private/wqueue.h
+include/mysql/private/wsrep.h
 lib/mysql/libmysqld.a
 lib/mysql/libmysqld.so
 lib/mysql/libmysqld.so.18
@@ -174,6 +234,7 @@ man/man8/mysqld.8.gz
 %%DATADIR%%/mysql_performance_tables.sql
 %%DATADIR%%/mysql_system_tables.sql
 %%DATADIR%%/mysql_system_tables_data.sql
+%%DATADIR%%/mysql_to_mariadb.sql
 %%DATADIR%%/mysql_test_data_timezone.sql
 %%DATADIR%%/mysqld_multi.server
 %%DATADIR%%/norwegian-ny/errmsg.sys