Major upgrade to mariadb-10.2.23

Some config options have changed or have been removed, check your config
file.  Also make sure to use mysql_upgrade.

Update effort started by jeremy@, continued by sthen@ and me.  Delayed
for some time because of lack of atomic builtins on lots of our base-gcc
platforms.  Since we now use ports-gcc to build mariadb, this is not
a problem any more.

This update brings in libiconv and changes the name of the library.
Stuart kindly proposed to handle the WANTLIB syncing.

Test reports for the server from jcs@ and sthen@.
ok sthen@, "go ahead" Brad (maintainer)

databases/mariadb/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.74 2019/05/07 08:29:28 sthen Exp $
+# $OpenBSD: Makefile,v 1.75 2019/05/12 21:56:55 jca Exp $
 
 # archs with atomic ops
 ONLY_FOR_ARCHS-server=	alpha aarch64 amd64 arm i386 mips64 mips64el powerpc sparc64
@@ -8,23 +8,21 @@ COMMENT-main=	multithreaded SQL database (client)
 COMMENT-server=	multithreaded SQL database (server)
 COMMENT-tests=	multithreaded SQL database (regression test suite/benchmark)
 
-VERSION=	10.0.38
+VERSION=	10.2.23
 DISTNAME=	mariadb-${VERSION}
 PKGNAME-main=	mariadb-client-${VERSION}
 PKGNAME-server=	mariadb-server-${VERSION}
 PKGNAME-tests=	mariadb-tests-${VERSION}
-REVISION-main=	0
-REVISION-server=1
-REVISION-tests=	0
 EPOCH=		1
 
 CATEGORIES=	databases
 MASTER_SITES=	https://downloads.mariadb.com/MariaDB/${DISTNAME}/source/ \
 		https://ftp.osuosl.org/pub/mariadb/${DISTNAME}/source/ \
 
-LIB_VERSION=	27
+LIB_VERSION=	28
 SHARED_LIBS=	mysqlclient_r	${LIB_VERSION}.0 \
-		mysqlclient	${LIB_VERSION}.0
+		mysqlclient	${LIB_VERSION}.0 \
+		mariadb		${LIB_VERSION}.0
 
 HOMEPAGE=	https://mariadb.org/
 
@@ -33,10 +31,12 @@ MAINTAINER=	Brad Smith <brad@comstyle.com>
 # GPLv2 and LGPLv2.1
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB=	c crypto m pthread ssl ${COMPILER_LIBCXX} z
-WANTLIB-main=	curses readline ${WANTLIB}
-WANTLIB-server=	mysqlclient pcre xml2 ${WANTLIB}
-WANTLIB-tests=	mysqlclient pcre pcreposix ${WANTLIB}
+WANTLIB=	${COMPILER_LIBCXX} c crypto iconv m pthread ssl z
+WANTLIB-main=	${WANTLIB} curses readline
+WANTLIB-server=	${WANTLIB} bz2 lz4 lzma lzo2 pcre snappy
+WANTLIB-tests=	${WANTLIB} pcre pcreposix
+
+COMPILER=	base-clang ports-gcc
 
 LOCALSTATEDIR=	${BASELOCALSTATEDIR}/mysql
 SOCKET_DIR=	/var/run/mysql
@@ -45,15 +45,22 @@ SUBST_VARS=	SOCKET_DIR
 MODULES=	devel/cmake
 BUILD_DEPENDS=	devel/bison
 
-RUN_DEPENDS-server=	${BASE_PKGPATH}>=10.0v1,<10.1v1 \
+LIB_DEPENDS-main=	${LIB_DEPENDS} \
+			converters/libiconv
+RUN_DEPENDS-server=	${BASE_PKGPATH},-main>=10.2v1,<10.3v1 \
 			databases/p5-DBD-mysql
-LIB_DEPENDS-server=	${BASE_PKGPATH}>=10.0v1,<10.1v1 \
-			devel/pcre \
-			textproc/libxml
-LIB_DEPENDS-tests=	${BASE_PKGPATH}>=10.0v1,<10.1v1 \
+LIB_DEPENDS-server=	${LIB_DEPENDS} \
+			archivers/bzip2 \
+			archivers/lz4 \
+			archivers/lzo2 \
+			archivers/snappy \
+			archivers/xz \
+			converters/libiconv \
+			devel/pcre
+RUN_DEPENDS-tests=	${BASE_PKGPATH},-main>=10.2v1,<10.3v1
+LIB_DEPENDS-tests=	${LIB_DEPENDS} \
+			converters/libiconv \
 			devel/pcre
-
-COMPILER=	base-clang ports-gcc
 
 CONFIGURE_ARGS+=-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 		-DINSTALL_DOCDIR="share/doc/mysql" \
@@ -76,6 +83,7 @@ CONFIGURE_ARGS+=-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 		-DWITH_PCRE=system \
 		-DWITH_SSL=system \
 		-DCONNECT_WITH_JDBC=Off \
+		-DCONNECT_WITH_LIBXML2=Off \
 		-DCONNECT_WITH_ODBC=Off \
 		-DGRN_WITH_MECAB=no \
 		-DGRN_WITH_KYTEA=no \
@@ -93,11 +101,12 @@ CONFIGURE_ARGS+=-DHAVE_EXECINFO_H=0 \
 # CMake test fails on OpenBSD
 CONFIGURE_ARGS+=-DHAVE_NETINET_TCP_H=1
 
-# The Mroonga and TokuDB storage engines are disabled.
-# Mroonga is only buildable on little endian archs.
-# TokuDB is only builable on 64-bit little endian archs.
+# The Mroonga, TokuDB and RocksDB storage engines are disabled.
+# Mroonga and RocksDB are only buildable on little endian archs.
+# TokuDB is only buildable on 64-bit little endian archs.
 CONFIGURE_ARGS+=-DWITHOUT_MROONGA_STORAGE_ENGINE=1 \
 		-DWITHOUT_TOKUDB_STORAGE_ENGINE=1
+CONFIGURE_ARGS+=-DWITHOUT_ROCKSDB_STORAGE_ENGINE=1
 
 CFLAGS+=	-I${LOCALBASE}/include
 CXXFLAGS+=	-I${LOCALBASE}/include
@@ -106,6 +115,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 
 MULTI_PACKAGES=	-main -server -tests
+PSEUDO_FLAVORS=	no_server no_tests
 
 .include <bsd.port.arch.mk>
 
@@ -118,12 +128,19 @@ CONFIGURE_ARGS+=-DWITH_UNIT_TESTS=Off
 .endif
 
 pre-configure:
-	@${SUBST_CMD} ${WRKSRC}/cmake/mysql_version.cmake
+	@${SUBST_CMD} ${WRKSRC}/cmake/mysql_version.cmake \
+	    ${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c.in \
+	    ${WRKSRC}/scripts/mysql_config.sh
 
 post-install:
 	@cd ${PREFIX}/lib && \
 		ln -sf mysql/libmysqlclient.so.${LIBmysqlclient_VERSION} . && \
-		ln -sf mysql/libmysqlclient_r.so.${LIBmysqlclient_r_VERSION} .
+		ln -sf mysql/libmysqlclient_r.so.${LIBmysqlclient_r_VERSION} . && \
+		ln -sf mysql/libmariadb.so.${LIBmariadb_VERSION} . && \
+		cd mysql && \
+		ln -sf libmariadb.so.${LIBmariadb_VERSION} libmysqlclient.so.${LIBmysqlclient_VERSION} && \
+		ln -sf libmariadb.so.${LIBmariadb_VERSION} libmysqlclient_r.so.${LIBmysqlclient_r_VERSION}
+	rm -Rf ${PREFIX}/share/mysql-test/plugin/rocksdb/
 
 .if ${BUILD_PACKAGES:M-tests}
 do-regress:

databases/mariadb/distinfo

@@ -1,2 +1,2 @@
-SHA256 (mariadb-10.0.38.tar.gz) = AiYg6+tPs3RNEB5yRD7FW0WF59mj2MkqqEa8MOaAisE=
-SIZE (mariadb-10.0.38.tar.gz) = 64755921
+SHA256 (mariadb-10.2.23.tar.gz) = DFurWM3Iq2IG9+bptvM2dCqTJIwLmqfnprsDF1arbBc=
+SIZE (mariadb-10.2.23.tar.gz) = 71914588

databases/mariadb/patches/patch-client_CMakeLists_txt

@@ -1,72 +1,73 @@
-$OpenBSD: patch-client_CMakeLists_txt,v 1.9 2019/02/10 21:23:00 sthen Exp $
+$OpenBSD: patch-client_CMakeLists_txt,v 1.10 2019/05/12 21:56:55 jca Exp $
 Index: client/CMakeLists.txt
 --- client/CMakeLists.txt.orig
 +++ client/CMakeLists.txt
-@@ -33,7 +33,7 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
+@@ -38,7 +38,7 @@ SET(CLIENT_LIB mariadbclient mysys)
  ADD_DEFINITIONS(${SSL_DEFINES})
  MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc
                             ${CMAKE_SOURCE_DIR}/sql/sql_string.cc)
--TARGET_LINK_LIBRARIES(mysql mysqlclient)
-+TARGET_LINK_LIBRARIES(mysql clientlib libmysql mysys ${SSL_LIBRARIES})
+-TARGET_LINK_LIBRARIES(mysql ${CLIENT_LIB})
++TARGET_LINK_LIBRARIES(mysql ${CLIENT_LIB} ${SSL_LIBRARIES})
  IF(UNIX)
    TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})
    SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
-@@ -41,39 +41,39 @@ ENDIF(UNIX)
+@@ -46,40 +46,40 @@ ENDIF(UNIX)
  
  MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
  SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
--TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcreposix pcre)
-+TARGET_LINK_LIBRARIES(mysqltest clientlib libmysql mysys pcreposix pcre ${SSL_LIBRARIES})
+-TARGET_LINK_LIBRARIES(mysqltest  ${CLIENT_LIB} pcreposix pcre)
++TARGET_LINK_LIBRARIES(mysqltest  ${CLIENT_LIB} pcreposix pcre ${SSL_LIBRARIES})
  SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
  
  
  MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
--TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
-+TARGET_LINK_LIBRARIES(mysqlcheck clientlib libmysql mysys ${SSL_LIBRARIES})
+-TARGET_LINK_LIBRARIES(mysqlcheck ${CLIENT_LIB})
++TARGET_LINK_LIBRARIES(mysqlcheck ${CLIENT_LIB} ${SSL_LIBRARIES})
  
  MYSQL_ADD_EXECUTABLE(mysqldump mysqldump.c ../sql-common/my_user.c)
--TARGET_LINK_LIBRARIES(mysqldump mysqlclient)
-+TARGET_LINK_LIBRARIES(mysqldump clientlib libmysql mysys ${SSL_LIBRARIES})
+-TARGET_LINK_LIBRARIES(mysqldump ${CLIENT_LIB})
++TARGET_LINK_LIBRARIES(mysqldump ${CLIENT_LIB} ${SSL_LIBRARIES})
+ 
  
  MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
  SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
--TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
-+TARGET_LINK_LIBRARIES(mysqlimport clientlib libmysql mysys ${SSL_LIBRARIES})
+-TARGET_LINK_LIBRARIES(mysqlimport ${CLIENT_LIB})
++TARGET_LINK_LIBRARIES(mysqlimport ${CLIENT_LIB} ${SSL_LIBRARIES})
  
  MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server)
--TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
-+TARGET_LINK_LIBRARIES(mysql_upgrade clientlib libmysql mysys ${SSL_LIBRARIES})
+-TARGET_LINK_LIBRARIES(mysql_upgrade ${CLIENT_LIB})
++TARGET_LINK_LIBRARIES(mysql_upgrade ${CLIENT_LIB} ${SSL_LIBRARIES})
  ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
  
  MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
--TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
-+TARGET_LINK_LIBRARIES(mysqlshow clientlib libmysql mysys ${SSL_LIBRARIES})
+-TARGET_LINK_LIBRARIES(mysqlshow ${CLIENT_LIB})
++TARGET_LINK_LIBRARIES(mysqlshow ${CLIENT_LIB} ${SSL_LIBRARIES})
  
  MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
--TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
-+TARGET_LINK_LIBRARIES(mysql_plugin clientlib libmysql mysys ${SSL_LIBRARIES})
+-TARGET_LINK_LIBRARIES(mysql_plugin ${CLIENT_LIB})
++TARGET_LINK_LIBRARIES(mysql_plugin ${CLIENT_LIB} ${SSL_LIBRARIES})
  
  MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
--TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
-+TARGET_LINK_LIBRARIES(mysqlbinlog clientlib libmysql mysys ${SSL_LIBRARIES})
+-TARGET_LINK_LIBRARIES(mysqlbinlog ${CLIENT_LIB})
++TARGET_LINK_LIBRARIES(mysqlbinlog ${CLIENT_LIB} ${SSL_LIBRARIES})
  
- MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc)
--TARGET_LINK_LIBRARIES(mysqladmin mysqlclient)
-+TARGET_LINK_LIBRARIES(mysqladmin clientlib libmysql mysys ${SSL_LIBRARIES})
+ MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc ../sql/password.c)
+-TARGET_LINK_LIBRARIES(mysqladmin ${CLIENT_LIB})
++TARGET_LINK_LIBRARIES(mysqladmin ${CLIENT_LIB} ${SSL_LIBRARIES})
  
  MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
  SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
--TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
-+TARGET_LINK_LIBRARIES(mysqlslap clientlib libmysql mysys ${SSL_LIBRARIES})
+-TARGET_LINK_LIBRARIES(mysqlslap ${CLIENT_LIB})
++TARGET_LINK_LIBRARIES(mysqlslap ${CLIENT_LIB} ${SSL_LIBRARIES})
  
  # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
  IF(WIN32)
-@@ -82,7 +82,7 @@ ENDIF(WIN32)
+@@ -88,7 +88,7 @@ ENDIF(WIN32)
  
  # async_example is just a code example, do not install it.
  ADD_EXECUTABLE(async_example async_example.c)
--TARGET_LINK_LIBRARIES(async_example mysqlclient)
-+TARGET_LINK_LIBRARIES(async_example clientlib libmysql mysys ${SSL_LIBRARIES})
+-TARGET_LINK_LIBRARIES(async_example ${CLIENT_LIB})
++TARGET_LINK_LIBRARIES(async_example ${CLIENT_LIB} ${SSL_LIBRARIES})
  
  SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example
  PROPERTIES HAS_CXX TRUE)

databases/mariadb/patches/patch-client_mysqladmin_cc

@@ -0,0 +1,16 @@
+$OpenBSD: patch-client_mysqladmin_cc,v 1.1 2019/05/12 21:56:55 jca Exp $
+
+Default value for connect timeout is rejected by the kernel.
+
+Index: client/mysqladmin.cc
+--- client/mysqladmin.cc.orig
++++ client/mysqladmin.cc
+@@ -221,7 +221,7 @@ static struct my_option my_long_options[] =
+   {"wait", 'w', "Wait and retry if connection is down.", 0, 0, 0, GET_UINT,
+    OPT_ARG, 0, 0, 0, 0, 0, 0},
+   {"connect_timeout", OPT_CONNECT_TIMEOUT, "", &opt_connect_timeout,
+-   &opt_connect_timeout, 0, GET_ULONG, REQUIRED_ARG, 3600*12, 0,
++   &opt_connect_timeout, 0, GET_ULONG, REQUIRED_ARG, 0, 0,
+    3600*12, 0, 1, 0},
+   {"shutdown_timeout", OPT_SHUTDOWN_TIMEOUT, "", &opt_shutdown_timeout,
+    &opt_shutdown_timeout, 0, GET_ULONG, REQUIRED_ARG,

databases/mariadb/patches/patch-cmake_install_macros_cmake

@@ -1,8 +1,8 @@
-$OpenBSD: patch-cmake_install_macros_cmake,v 1.10 2018/08/09 10:58:52 sthen Exp $
+$OpenBSD: patch-cmake_install_macros_cmake,v 1.11 2019/05/12 21:56:55 jca Exp $
 Index: cmake/install_macros.cmake
 --- cmake/install_macros.cmake.orig
 +++ cmake/install_macros.cmake
-@@ -195,6 +195,36 @@ IF(UNIX)
+@@ -181,6 +181,36 @@ IF(UNIX)
  ENDIF()
  ENDMACRO()
  

databases/mariadb/patches/patch-cmake_mysql_version_cmake

@@ -1,11 +1,12 @@
-$OpenBSD: patch-cmake_mysql_version_cmake,v 1.1.1.1 2013/04/04 18:58:44 brad Exp $
---- cmake/mysql_version.cmake.orig	Fri Sep  9 17:56:39 2011
-+++ cmake/mysql_version.cmake	Thu Oct 13 12:14:37 2011
+$OpenBSD: patch-cmake_mysql_version_cmake,v 1.2 2019/05/12 21:56:55 jca Exp $
+Index: cmake/mysql_version.cmake
+--- cmake/mysql_version.cmake.orig
++++ cmake/mysql_version.cmake
 @@ -17,7 +17,7 @@
  # Global constants, only to be changed between major releases.
  #
  
--SET(SHARED_LIB_MAJOR_VERSION "18")
+-SET(SHARED_LIB_MAJOR_VERSION "19")
 +SET(SHARED_LIB_MAJOR_VERSION "${LIB_VERSION}")
  SET(PROTOCOL_VERSION "10")
  SET(DOT_FRM_VERSION "6")

databases/mariadb/patches/patch-libmariadb_libmariadb_CMakeLists_txt

@@ -0,0 +1,34 @@
+$OpenBSD: patch-libmariadb_libmariadb_CMakeLists_txt,v 1.1 2019/05/12 21:56:55 jca Exp $
+
+Index: libmariadb/libmariadb/CMakeLists.txt
+--- libmariadb/libmariadb/CMakeLists.txt.orig
++++ libmariadb/libmariadb/CMakeLists.txt
+@@ -385,6 +385,8 @@ ENDIF()
+ ADD_LIBRARY(mariadbclient STATIC  ${MARIADB_OBJECTS} ${EMPTY_FILE})
+ TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS})
+ 
++SET(LIBVER_OVERRIDE $ENV{LIBmariadb_VERSION})
++
+ IF(UNIX)
+   ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE})
+   SET_TARGET_PROPERTIES(libmariadb PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")
+@@ -424,16 +426,12 @@ INCLUDE(${CC_SOURCE_DIR}/cmake/symlink.cmake)
+ # use mariadb client library we provide libmysql symlinks
+ 
+ IF(WITH_MYSQLCOMPAT)
+-  create_symlink(libmysqlclient${CMAKE_SHARED_LIBRARY_SUFFIX} libmariadb ${INSTALL_LIBDIR})
+-  create_symlink(libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX} libmariadb ${INSTALL_LIBDIR})
+-  create_symlink(libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR})
+-  create_symlink(libmysqlclient_r${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR})
+ ENDIF()
+ 
+-
++MESSAGE( STATUS "!!!LIBVER_OVERRIDE:         " ${LIBVER_OVERRIDE} )
+ SET_TARGET_PROPERTIES(libmariadb PROPERTIES VERSION
+- ${CPACK_PACKAGE_VERSION_MAJOR}
+- SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
++ ${LIBVER_OVERRIDE}
++ SOVERSION ${LIBVER_OVERRIDE})
+ 
+ IF(NOT WIN32)
+   SET_TARGET_PROPERTIES(mariadbclient PROPERTIES OUTPUT_NAME "${LIBMARIADB_STATIC_NAME}")

databases/mariadb/patches/patch-libmariadb_libmariadb_ma_charset_c

@@ -0,0 +1,29 @@
+$OpenBSD: patch-libmariadb_libmariadb_ma_charset_c,v 1.1 2019/05/12 21:56:55 jca Exp $
+
+Index: libmariadb/libmariadb/ma_charset.c
+--- libmariadb/libmariadb/ma_charset.c.orig
++++ libmariadb/libmariadb/ma_charset.c
+@@ -1446,12 +1446,12 @@ size_t STDCALL mariadb_convert_string(const char *from
+   map_charset_name(to_cs->encoding, 1, to_encoding, sizeof(to_encoding));
+   map_charset_name(from_cs->encoding, 0, from_encoding, sizeof(from_encoding));
+ 
+-  if ((conv= iconv_open(to_encoding, from_encoding)) == (iconv_t)-1)
++  if ((conv= libiconv_open(to_encoding, from_encoding)) == (iconv_t)-1)
+   {
+     *errorcode= errno;
+     goto error;
+   }
+-  if ((rc= iconv(conv, IF_WIN(,(char **))&from, from_len, &to, to_len)) == (size_t)-1)
++  if ((rc= libiconv(conv, IF_WIN(,(char **))&from, from_len, &to, to_len)) == (size_t)-1)
+   {
+     *errorcode= errno;
+     goto error;
+@@ -1459,7 +1459,7 @@ size_t STDCALL mariadb_convert_string(const char *from
+   rc= save_len - *to_len;
+ error:
+   if (conv != (iconv_t)-1)
+-    iconv_close(conv);
++    libiconv_close(conv);
+   return rc;
+ }
+ /* }}} */

databases/mariadb/patches/patch-libmariadb_mariadb_config_mariadb_config_c_in

@@ -0,0 +1,16 @@
+$OpenBSD: patch-libmariadb_mariadb_config_mariadb_config_c_in,v 1.1 2019/05/12 21:56:55 jca Exp $
+
+Forcefully add -L${LOCALBASE}/lib to --libs so that libiconv can be found.
+
+Index: libmariadb/mariadb_config/mariadb_config.c.in
+--- libmariadb/mariadb_config/mariadb_config.c.in.orig
++++ libmariadb/mariadb_config/mariadb_config.c.in
+@@ -6,7 +6,7 @@
+ static char *mariadb_progname;
+ 
+ #define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql"
+-#define LIBS    "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb @extra_dynamic_LDFLAGS@"
++#define LIBS    "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -L${LOCALBASE}/lib -lmariadb @extra_dynamic_LDFLAGS@"
+ #define LIBS_SYS "@extra_dynamic_LDFLAGS@"
+ #define CFLAGS  INCLUDE
+ #define VERSION "@MARIADB_CLIENT_VERSION@"

databases/mariadb/patches/patch-libmariadb_unittest_libmariadb_CMakeLists_txt

@@ -0,0 +1,28 @@
+$OpenBSD: patch-libmariadb_unittest_libmariadb_CMakeLists_txt,v 1.1 2019/05/12 21:56:55 jca Exp $
+
+Index: libmariadb/unittest/libmariadb/CMakeLists.txt
+--- libmariadb/unittest/libmariadb/CMakeLists.txt.orig
++++ libmariadb/unittest/libmariadb/CMakeLists.txt
+@@ -25,6 +25,7 @@ INCLUDE_DIRECTORIES(${CC_SOURCE_DIR}/include
+                     ${CC_SOURCE_DIR}/unittest/mytap
+                     ${CC_SOURCE_DIR}/unittest/libmariadb)
+ ADD_DEFINITIONS(-DLIBMARIADB)
++FIND_PACKAGE(Iconv)
+ 
+ SET(API_TESTS "conc336" "bulk1" "performance" "basic-t" "fetch" "charset" "logs" "cursor" "errors" "view" "ps" "ps_bugs" "sp" "result" "connection" "misc" "ps_new" "thread" "features-10_2" "bulk1")
+ IF(WITH_DYNCOL)
+@@ -62,12 +63,12 @@ FOREACH(API_TEST ${API_TESTS})
+   IF (NOT TARGET ${API_TEST})
+     ADD_EXECUTABLE(${API_TEST} ${API_TEST}.c)
+   ENDIF()
+-  TARGET_LINK_LIBRARIES(${API_TEST} cctap ma_getopt mariadbclient)
++  TARGET_LINK_LIBRARIES(${API_TEST} ${ICONV_LIBRARIES} cctap ma_getopt mariadbclient)
+   ADD_TEST(${API_TEST} ${EXECUTABLE_OUTPUT_PATH}/${API_TEST})
+   SET_TESTS_PROPERTIES(${API_TEST} PROPERTIES TIMEOUT 180)
+ ENDFOREACH(API_TEST)
+ 
+ FOREACH(API_TEST ${MANUAL_TESTS})
+   ADD_EXECUTABLE(${API_TEST} ${API_TEST}.c)
+-  TARGET_LINK_LIBRARIES(${API_TEST} cctap ma_getopt mariadbclient)
++  TARGET_LINK_LIBRARIES(${API_TEST} ${ICONV_LIBRARIES} cctap ma_getopt mariadbclient)
+ ENDFOREACH()

databases/mariadb/patches/patch-libmysql_CMakeLists_txt

@@ -1,58 +0,0 @@
-$OpenBSD: patch-libmysql_CMakeLists_txt,v 1.12 2018/02/05 10:40:03 sthen Exp $
-Index: libmysql/CMakeLists.txt
---- libmysql/CMakeLists.txt.orig
-+++ libmysql/CMakeLists.txt
-@@ -266,6 +266,8 @@ mysql_net_field_length
- mysql_options4
- )
- 
-+SET(LIBVER_OVERRIDE $ENV{LIBmysqlclient_VERSION})
-+
- SET(CLIENT_API_FUNCTIONS
-   ${CLIENT_API_FUNCTIONS_5_1}
-   ${CLIENT_API_FUNCTIONS_5_5}
-@@ -479,8 +481,12 @@ IF(NOT DISABLE_SHARED)
-     # libtool compatability
-     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-       SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
--    ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX")
--      SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0")
-+    ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX" OR CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-+      IF(LIBVER_OVERRIDE)
-+        SET(OS_SHARED_LIB_VERSION "${LIBVER_OVERRIDE}")
-+      ELSE()
-+        SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0")
-+      ENDIF(LIBVER_OVERRIDE)
-     ELSE()
-       SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0.0")
-     ENDIF()
-@@ -488,7 +494,7 @@ IF(NOT DISABLE_SHARED)
-     SET_TARGET_PROPERTIES(libmysql PROPERTIES 
-       OUTPUT_NAME mysqlclient 
-       VERSION "${OS_SHARED_LIB_VERSION}" 
--      SOVERSION "${SHARED_LIB_MAJOR_VERSION}")
-+      SOVERSION "${OS_SHARED_LIB_VERSION}")
-     IF(VERSION_SCRIPT_LINK_FLAGS)
-       GET_TARGET_PROPERTY(libmysql_link_flags libmysql LINK_FLAGS)
-       IF(NOT libmysql_link_flags)
-@@ -507,18 +513,8 @@ IF(NOT DISABLE_SHARED)
-     GET_VERSIONED_LIBNAME(
-       "${CMAKE_SHARED_LIBRARY_PREFIX}mysqlclient_r"
-       "${CMAKE_SHARED_LIBRARY_SUFFIX}"
--      ""
-+      "${OS_SHARED_LIB_VERSION}"
-       linkname)
--    INSTALL_SYMLINK(${linkname} libmysql ${INSTALL_LIBDIR} SharedLibraries)
--    SET(OS_SHARED_LIB_SYMLINKS "${SHARED_LIB_MAJOR_VERSION}" "${OS_SHARED_LIB_VERSION}")
--    LIST(REMOVE_DUPLICATES OS_SHARED_LIB_SYMLINKS)
--    FOREACH(ver ${OS_SHARED_LIB_SYMLINKS})
--      GET_VERSIONED_LIBNAME(
--        "${CMAKE_SHARED_LIBRARY_PREFIX}mysqlclient_r"
--        "${CMAKE_SHARED_LIBRARY_SUFFIX}"
--        "${ver}"
--        linkname)
--      INSTALL_SYMLINK(${linkname} libmysql ${INSTALL_LIBDIR} SharedLibraries)
--    ENDFOREACH()
-+    INSTALL_VERSIONED_SYMLINK(${linkname} libmysql ${INSTALL_LIBDIR} SharedLibraries)
-   ENDIF()
- ENDIF()

databases/mariadb/patches/patch-man_mysqladmin_1

@@ -0,0 +1,17 @@
+$OpenBSD: patch-man_mysqladmin_1,v 1.1 2019/05/12 21:56:55 jca Exp $
+
+Default value for connect timeout is rejected by the kernel.
+
+Index: man/mysqladmin.1
+--- man/mysqladmin.1.orig
++++ man/mysqladmin.1
+@@ -1457,8 +1457,7 @@ You can also set the following variables by using
+ .\" timeout: connect_timeout variable
+ connect_timeout
+ .sp
+-The maximum number of seconds before connection timeout\&. The default value is 43200 (12 hours)\&.
+-.RE
++The maximum number of seconds before connection timeout\&. The default value is 600 (10 mn)\&..RE
+ .sp
+ .RS 4
+ .ie n \{\

databases/mariadb/patches/patch-scripts_CMakeLists_txt

@@ -1,29 +1,31 @@
-$OpenBSD: patch-scripts_CMakeLists_txt,v 1.9 2018/08/09 10:58:52 sthen Exp $
+$OpenBSD: patch-scripts_CMakeLists_txt,v 1.10 2019/05/12 21:56:55 jca Exp $
 Index: scripts/CMakeLists.txt
 --- scripts/CMakeLists.txt.orig
 +++ scripts/CMakeLists.txt
-@@ -185,22 +185,13 @@ ENDIF(UNIX)
+@@ -169,25 +169,14 @@ ENDIF(UNIX)
  # i.e. makes access relative the current directory. This matches
  # the documentation, so better not change this.
  
 -IF(INSTALL_LAYOUT MATCHES "STANDALONE")
 -  SET(prefix ".")
--ELSE()
--  SET(prefix "${CMAKE_INSTALL_PREFIX}")
--ENDIF()
--
-+SET(prefix "${CMAKE_INSTALL_PREFIX}")
- SET(bindir ${prefix}/${INSTALL_BINDIR})
- SET(sbindir ${prefix}/${INSTALL_SBINDIR})
- SET(scriptdir ${prefix}/${INSTALL_BINDIR})
- SET(libexecdir ${prefix}/${INSTALL_SBINDIR})
- SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR})
--IF(INSTALL_LAYOUT MATCHES "STANDALONE")
++  SET(prefix "${CMAKE_INSTALL_PREFIX}")
+   SET(bindir ${prefix}/${INSTALL_BINDIR})
+   SET(sbindir ${prefix}/${INSTALL_SBINDIR})
+   SET(scriptdir ${prefix}/${INSTALL_BINDIR})
+   SET(libexecdir ${prefix}/${INSTALL_SBINDIR})
+   SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR})
+   SET(pkgplugindir ${prefix}/${INSTALL_PLUGINDIR})
 -  SET(localstatedir ${prefix}/data)
 -ELSE()
--  SET(localstatedir ${MYSQL_DATADIR})
+-  SET(prefix "${CMAKE_INSTALL_PREFIX}")
+-  SET(bindir ${INSTALL_BINDIRABS})
+-  SET(sbindir ${INSTALL_SBINDIRABS})
+-  SET(scriptdir ${INSTALL_BINDIRABS})
+-  SET(libexecdir ${INSTALL_SBINDIRABS})
+-  SET(pkgdatadir ${INSTALL_MYSQLSHAREDIRABS})
+-  SET(pkgplugindir ${INSTALL_PLUGINDIRABS})
+   SET(localstatedir ${MYSQL_DATADIR})
 -ENDIF()
-+SET(localstatedir ${MYSQL_DATADIR})
  
  SET(resolveip_locations "$basedir/${INSTALL_BINDIR} $basedir/bin")
  SET(mysqld_locations "$basedir/${INSTALL_SBINDIR} $basedir/libexec $basedir/sbin $basedir/bin")

databases/mariadb/patches/patch-scripts_mysql_config_sh

@@ -0,0 +1,16 @@
+$OpenBSD: patch-scripts_mysql_config_sh,v 1.1 2019/05/12 21:56:55 jca Exp $
+
+Forcefully add -L${LOCALBASE}/lib to --libs so that libiconv can be found.
+
+Index: scripts/mysql_config.sh
+--- scripts/mysql_config.sh.orig
++++ scripts/mysql_config.sh
+@@ -105,7 +105,7 @@ else
+ fi
+ 
+ # Create options 
+-libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@"
++libs="-L$pkglibdir -L${LOCALBASE}/lib @RPATH_OPTION@ @LIBS_FOR_CLIENTS@"
+ embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@"
+ 
+ include="-I$pkgincludedir"

databases/mariadb/patches/patch-scripts_mysql_install_db_sh

@@ -1,4 +1,4 @@
-$OpenBSD: patch-scripts_mysql_install_db_sh,v 1.12 2019/03/01 15:27:05 sthen Exp $
+$OpenBSD: patch-scripts_mysql_install_db_sh,v 1.13 2019/05/12 21:56:55 jca Exp $
 Index: scripts/mysql_install_db.sh
 --- scripts/mysql_install_db.sh.orig
 +++ scripts/mysql_install_db.sh
@@ -9,28 +9,19 @@ Index: scripts/mysql_install_db.sh
 -user=""
 +user=_mysql
 +group=_mysql
+ silent_startup="--silent-startup"
  
  force=0
- in_rpm=0
-@@ -130,6 +131,8 @@ parse_arguments()
+@@ -148,6 +149,8 @@ parse_arguments()
          # as 'user' (crucial e.g. if log-bin=/some_other_path/
          # where a chown of datadir won't help)
          user=`parse_arg "$arg"` ;;
 +      --group=*)
 +        group=`parse_arg "$arg"` ;;
        --skip-name-resolve) ip_only=1 ;;
-       --verbose) verbose=1 ;; # Obsolete
+       --verbose) verbose=1 ; silent_startup="" ;;
        --rpm) in_rpm=1 ;;
-@@ -314,7 +317,7 @@ then
- elif test -n "$dirname0" -a -x "$dirname0/@INSTALL_SBINDIR@/mysqld"
- then
-   basedir="$dirname0"
--  bindir="$basedir/@INSTALL_SBINDIR@"
-+  bindir="$basedir/@INSTALL_BINDIR@"
-   resolveip="$bindir/resolveip"
-   mysqld="$basedir/@INSTALL_SBINDIR@/mysqld"
-   pkgdatadir="$basedir/@INSTALL_MYSQLSHAREDIR@"
-@@ -410,11 +413,11 @@ do
+@@ -450,11 +453,11 @@ do
    fi
    if test -n "$user"
    then
@@ -45,7 +36,7 @@ Index: scripts/mysql_install_db.sh
        exit 1
      fi
    fi
-@@ -498,10 +501,6 @@ fi
+@@ -539,10 +542,6 @@ fi
  # the screen.
  if test "$cross_bootstrap" -eq 0 && test -z "$srcdir"
  then
@@ -53,10 +44,10 @@ Index: scripts/mysql_install_db.sh
 -  s_echo "To start mysqld at boot time you have to copy"
 -  s_echo "support-files/mysql.server to the right place for your system"
 -
-   echo
-   echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MariaDB root USER !"
-   echo "To do so, start the server, then issue the following commands:"
-@@ -523,10 +522,7 @@ then
+   if test "$auth_root_authentication_method" = normal
+   then
+     echo
+@@ -569,10 +568,7 @@ then
    then
      echo
      echo "You can start the MariaDB daemon with:"

databases/mariadb/patches/patch-scripts_mysqld_safe_sh

@@ -1,7 +1,8 @@
-$OpenBSD: patch-scripts_mysqld_safe_sh,v 1.12 2017/01/20 10:03:10 sthen Exp $
---- scripts/mysqld_safe.sh.orig	Wed Jan 11 20:45:19 2017
-+++ scripts/mysqld_safe.sh	Wed Jan 18 21:06:16 2017
-@@ -26,7 +26,8 @@ unsafe_my_cnf=0
+$OpenBSD: patch-scripts_mysqld_safe_sh,v 1.13 2019/05/12 21:56:55 jca Exp $
+Index: scripts/mysqld_safe.sh
+--- scripts/mysqld_safe.sh.orig
++++ scripts/mysqld_safe.sh
+@@ -27,7 +27,8 @@ dry_run=0
  logging=init
  want_syslog=0
  syslog_tag=
@@ -11,7 +12,7 @@ $OpenBSD: patch-scripts_mysqld_safe_sh,v 1.12 2017/01/20 10:03:10 sthen Exp $
  pid_file=
  err_log=
  err_log_base=
-@@ -647,8 +648,8 @@ then
+@@ -747,8 +748,8 @@ then
      log_error "Fatal error Can't create database directory '$mysql_unix_port'"
      exit 1
    fi

databases/mariadb/patches/patch-sql_CMakeLists_txt

@@ -1,8 +1,8 @@
-$OpenBSD: patch-sql_CMakeLists_txt,v 1.15 2017/11/05 19:17:23 sthen Exp $
+$OpenBSD: patch-sql_CMakeLists_txt,v 1.16 2019/05/12 21:56:55 jca Exp $
 Index: sql/CMakeLists.txt
 --- sql/CMakeLists.txt.orig
 +++ sql/CMakeLists.txt
-@@ -350,7 +350,7 @@ ADD_CUSTOM_TARGET(distclean
+@@ -396,7 +396,7 @@ ADD_CUSTOM_TARGET(distclean
    VERBATIM
    )
  
@@ -11,7 +11,7 @@ Index: sql/CMakeLists.txt
  
  # Copy db.opt into data/test/
  SET(DBOPT_FILE ${CMAKE_SOURCE_DIR}/support-files/db.opt ) 
-@@ -392,7 +392,7 @@ ELSE()
+@@ -438,7 +438,7 @@ ELSE()
    # Not windows or cross compiling, just install an empty directory
    INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
  ENDIF(WIN32 AND MYSQLD_EXECUTABLE)

databases/mariadb/patches/patch-storage_oqgraph_CMakeLists_txt

@@ -1,18 +1,20 @@
-$OpenBSD: patch-storage_oqgraph_CMakeLists_txt,v 1.7 2017/10/11 17:30:01 espie Exp $
+$OpenBSD: patch-storage_oqgraph_CMakeLists_txt,v 1.8 2019/05/12 21:56:55 jca Exp $
 Index: storage/oqgraph/CMakeLists.txt
 --- storage/oqgraph/CMakeLists.txt.orig
 +++ storage/oqgraph/CMakeLists.txt
-@@ -1,11 +1,11 @@
+@@ -1,13 +1,12 @@
  set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 +# Disable oqgraph storage engine
 +IF(TRUE)
 +  RETURN()
 +ENDIF()
  
+ FUNCTION(CHECK_OQGRAPH)
  MESSAGE(STATUS "Configuring OQGraph")
  FIND_PACKAGE(Boost 1.40.0)
 -IF(NOT Boost_FOUND)
--   MESSAGE(STATUS "Boost not found. OQGraph will not be compiled")
+-  MESSAGE(STATUS "Boost not found. OQGraph will not be compiled")
+-  SET(OQGRAPH_OK 0 CACHE INTERNAL "")
 -  RETURN()
 -ENDIF()
  INCLUDE_DIRECTORIES(BEFORE ${Boost_INCLUDE_DIRS})

databases/mariadb/patches/patch-tests_CMakeLists_txt

@@ -1,18 +1,19 @@
-$OpenBSD: patch-tests_CMakeLists_txt,v 1.2 2017/04/24 08:47:58 sthen Exp $
---- tests/CMakeLists.txt.orig	Mon Mar  6 20:04:51 2017
-+++ tests/CMakeLists.txt	Sun Apr 23 20:58:50 2017
-@@ -18,12 +18,12 @@ ADD_DEFINITIONS("-DMYSQL_CLIENT")
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
- 
+$OpenBSD: patch-tests_CMakeLists_txt,v 1.3 2019/05/12 21:56:55 jca Exp $
+Index: tests/CMakeLists.txt
+--- tests/CMakeLists.txt.orig
++++ tests/CMakeLists.txt
+@@ -25,12 +25,12 @@ INCLUDE_DIRECTORIES(BEFORE
  ADD_EXECUTABLE(mysql_client_test mysql_client_test.c)
--TARGET_LINK_LIBRARIES(mysql_client_test mysqlclient)
-+TARGET_LINK_LIBRARIES(mysql_client_test clientlib libmysql mysys ${SSL_LIBRARIES})
- SET_TARGET_PROPERTIES(mysql_client_test PROPERTIES LINKER_LANGUAGE CXX)
+ SET(CLIENT_LIB mariadbclient mysys)
+ 
+-TARGET_LINK_LIBRARIES(mysql_client_test ${CLIENT_LIB})
++TARGET_LINK_LIBRARIES(mysql_client_test ${CLIENT_LIB} ${SSL_LIBRARIES})
+ ADD_DEPENDENCIES(mysql_client_test GenError ${CLIENT_LIB})
  
  IF(WITH_UNIT_TESTS)
    ADD_EXECUTABLE(bug25714 bug25714.c)
--  TARGET_LINK_LIBRARIES(bug25714 mysqlclient)
-+  TARGET_LINK_LIBRARIES(bug25714 libmysql ${SSL_LIBRARIES})
-   SET_TARGET_PROPERTIES(bug25714 PROPERTIES LINKER_LANGUAGE CXX)
+-  TARGET_LINK_LIBRARIES(bug25714 ${CLIENT_LIB})
++  TARGET_LINK_LIBRARIES(bug25714 ${CLIENT_LIB} ${SSL_LIBRARIES})
+   ADD_DEPENDENCIES(bug25714 GenError ${CLIENT_LIB})
  ENDIF()
  

databases/mariadb/pkg/PLIST-main

@@ -1,7 +1,8 @@
-@comment $OpenBSD: PLIST-main,v 1.15 2016/07/31 21:30:06 sthen Exp $
+@comment $OpenBSD: PLIST-main,v 1.16 2019/05/12 21:56:55 jca Exp $
 @conflict mysql-client-*
 @conflict mysql-server-*
 @pkgpath databases/mysql,-main
+@bin bin/mariadb_config
 bin/msql2mysql
 @bin bin/mysql
 bin/mysql_config
@@ -10,171 +11,76 @@ bin/mysql_find_rows
 bin/mysqlaccess
 @bin bin/mysqladmin
 @bin bin/mysqlbinlog
-bin/mysqlbug
 @bin bin/mysqlcheck
 @bin bin/mysqldump
-bin/mysqldumpslow
 @bin bin/mysqlimport
 @bin bin/mysqlshow
 @bin bin/mysqlslap
 include/mysql/
-include/mysql/auth_dialog_client.h
-include/mysql/big_endian.h
-include/mysql/byte_order_generic.h
-include/mysql/byte_order_generic_x86.h
-include/mysql/byte_order_generic_x86_64.h
-include/mysql/client_plugin.h
-include/mysql/decimal.h
 include/mysql/errmsg.h
-include/mysql/handler_ername.h
-include/mysql/handler_state.h
-include/mysql/keycache.h
-include/mysql/little_endian.h
-include/mysql/m_ctype.h
-include/mysql/m_string.h
-include/mysql/ma_dyncol.h
-include/mysql/my_alloc.h
-include/mysql/my_attribute.h
-include/mysql/my_byteorder.h
-include/mysql/my_compiler.h
+include/mysql/ma_list.h
+include/mysql/ma_pvio.h
+include/mysql/ma_tls.h
+include/mysql/mariadb/
+include/mysql/mariadb/ma_io.h
+include/mysql/mariadb_com.h
+include/mysql/mariadb_ctype.h
+include/mysql/mariadb_dyncol.h
+include/mysql/mariadb_stmt.h
+include/mysql/mariadb_version.h
 include/mysql/my_config.h
-include/mysql/my_dbug.h
-include/mysql/my_decimal_limits.h
-include/mysql/my_dir.h
-include/mysql/my_getopt.h
 include/mysql/my_global.h
-include/mysql/my_list.h
-include/mysql/my_net.h
-include/mysql/my_pthread.h
 include/mysql/my_sys.h
-include/mysql/my_valgrind.h
-include/mysql/my_xml.h
+include/mysql/mysql/
 include/mysql/mysql.h
+include/mysql/mysql/client_plugin.h
+include/mysql/mysql/plugin_auth.h
+include/mysql/mysql/plugin_auth_common.h
 include/mysql/mysql_com.h
-include/mysql/mysql_com_server.h
-include/mysql/mysql_embed.h
-include/mysql/mysql_time.h
 include/mysql/mysql_version.h
-include/mysql/mysqld_ername.h
 include/mysql/mysqld_error.h
-include/mysql/plugin.h
-include/mysql/plugin_audit.h
-include/mysql/plugin_auth.h
-include/mysql/plugin_auth_common.h
-include/mysql/plugin_ftparser.h
-include/mysql/private/
-include/mysql/private/atomic/
-include/mysql/private/atomic/gcc_builtins.h
-include/mysql/private/atomic/generic-msvc.h
-include/mysql/private/atomic/nolock.h
-include/mysql/private/atomic/rwlock.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/hash.h
-include/mysql/private/heap.h
-include/mysql/private/lf.h
-include/mysql/private/maria.h
-include/mysql/private/my_aes.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_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_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/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/psi/
-include/mysql/psi/mysql_file.h
-include/mysql/psi/mysql_idle.h
-include/mysql/psi/mysql_socket.h
-include/mysql/psi/mysql_stage.h
-include/mysql/psi/mysql_statement.h
-include/mysql/psi/mysql_table.h
-include/mysql/psi/mysql_thread.h
-include/mysql/psi/psi.h
-include/mysql/psi/psi_abi_v0.h
-include/mysql/psi/psi_abi_v1.h
-include/mysql/psi/psi_abi_v2.h
-include/mysql/service_debug_sync.h
-include/mysql/service_kill_statement.h
-include/mysql/service_logger.h
-include/mysql/service_my_plugin_log.h
-include/mysql/service_my_snprintf.h
-include/mysql/service_progress_report.h
-include/mysql/service_sha1.h
-include/mysql/service_thd_alloc.h
-include/mysql/service_thd_autoinc.h
-include/mysql/service_thd_error_context.h
-include/mysql/service_thd_timezone.h
-include/mysql/service_thd_wait.h
-include/mysql/services.h
-include/mysql/sql_common.h
-include/mysql/sql_state.h
-include/mysql/sslopt-case.h
-include/mysql/sslopt-longopts.h
-include/mysql/sslopt-vars.h
-include/mysql/typelib.h
+@lib lib/libmariadb.so.${LIBmariadb_VERSION}
 @lib lib/libmysqlclient.so.${LIBmysqlclient_VERSION}
 @lib lib/libmysqlclient_r.so.${LIBmysqlclient_r_VERSION}
 lib/mysql/
-lib/mysql/libmysqlclient.a
+@lib lib/mysql/libmariadb.so.${LIBmariadb_VERSION}
+lib/mysql/libmariadbclient.a
 @lib lib/mysql/libmysqlclient.so.${LIBmysqlclient_VERSION}
-lib/mysql/libmysqlclient_r.a
 @lib lib/mysql/libmysqlclient_r.so.${LIBmysqlclient_r_VERSION}
 lib/mysql/libmysqlservices.a
+lib/pkgconfig/libmariadb.pc
+@man man/man1/galera_new_cluster.1
+@man man/man1/galera_recovery.1
+@man man/man1/mariabackup.1
+@man man/man1/mariadb-service-convert.1
+@man man/man1/mbstream.1
 @man man/man1/msql2mysql.1
+@man man/man1/my_safe_process.1
 @man man/man1/mysql.1
 @man man/man1/mysql_config.1
+@man man/man1/mysql_embedded.1
 @man man/man1/mysql_find_rows.1
+@man man/man1/mysql_ldb.1
 @man man/man1/mysql_waitpid.1
 @man man/man1/mysqlaccess.1
 @man man/man1/mysqladmin.1
 @man man/man1/mysqlbinlog.1
-@man man/man1/mysqlbug.1
 @man man/man1/mysqlcheck.1
+@man man/man1/mysqld_safe_helper.1
 @man man/man1/mysqldump.1
 @man man/man1/mysqldumpslow.1
 @man man/man1/mysqlimport.1
 @man man/man1/mysqlshow.1
 @man man/man1/mysqlslap.1
+@man man/man1/tokuft_logprint.1
+@man man/man1/tokuftdump.1
+@man man/man1/wsrep_sst_common.1
+@man man/man1/wsrep_sst_mariabackup.1
+@man man/man1/wsrep_sst_mysqldump.1
+@man man/man1/wsrep_sst_rsync.1
+@man man/man1/wsrep_sst_rsync_wan.1
+@man man/man1/wsrep_sst_xtrabackup-v2.1
+@man man/man1/wsrep_sst_xtrabackup.1
 share/aclocal/
 share/aclocal/mysql.m4
+share/pkgconfig/mariadb.pc

databases/mariadb/pkg/PLIST-server

@@ -1,16 +1,19 @@
-@comment $OpenBSD: PLIST-server,v 1.24 2018/11/24 08:54:46 landry Exp $
+@comment $OpenBSD: PLIST-server,v 1.25 2019/05/12 21:56:55 jca Exp $
 @conflict mysql-server-*
 @conflict mytop-*
 @pkgpath databases/mysql,-server
 @pkgpath databases/mytop
 @newgroup _mysql:502
 @newuser _mysql:502:_mysql:daemon:MySQL Account:/nonexistent:/sbin/nologin
+@rcscript ${RCDIR}/mysqld
 @bin bin/aria_chk
 @bin bin/aria_dump_log
 @bin bin/aria_ftdump
 @bin bin/aria_pack
 @bin bin/aria_read_log
 @bin bin/innochecksum
+@bin bin/mariabackup
+@bin bin/mbstream
 @bin bin/my_print_defaults
 @bin bin/myisam_ftdump
 @bin bin/myisamchk
@@ -24,213 +27,390 @@ bin/mysql_secure_installation
 bin/mysql_setpermission
 @bin bin/mysql_tzinfo_to_sql
 @bin bin/mysql_upgrade
-bin/mysql_zap
 bin/mysqld_multi
 bin/mysqld_safe
 @bin bin/mysqld_safe_helper
+bin/mysqldumpslow
 bin/mysqlhotcopy
 bin/mytop
 @bin bin/perror
 @bin bin/replace
 @bin bin/resolve_stack_dump
 @bin bin/resolveip
-include/mysql/private/authors.h
-include/mysql/private/bounded_queue.h
-include/mysql/private/client_settings.h
-include/mysql/private/compat56.h
-include/mysql/private/contributors.h
-include/mysql/private/create_options.h
-include/mysql/private/custom_conf.h
-include/mysql/private/datadict.h
-include/mysql/private/debug_sync.h
-include/mysql/private/derror.h
-include/mysql/private/des_key_file.h
-include/mysql/private/discover.h
-include/mysql/private/event_data_objects.h
-include/mysql/private/event_db_repository.h
-include/mysql/private/event_parse_data.h
-include/mysql/private/event_queue.h
-include/mysql/private/event_scheduler.h
-include/mysql/private/events.h
-include/mysql/private/field.h
-include/mysql/private/filesort.h
-include/mysql/private/filesort_utils.h
-include/mysql/private/gcalc_slicescan.h
-include/mysql/private/gcalc_tools.h
-include/mysql/private/gstream.h
-include/mysql/private/ha_ndbcluster.h
-include/mysql/private/ha_ndbcluster_binlog.h
-include/mysql/private/ha_ndbcluster_cond.h
-include/mysql/private/ha_ndbcluster_tables.h
-include/mysql/private/ha_partition.h
-include/mysql/private/handler.h
-include/mysql/private/hash_filo.h
-include/mysql/private/hostname.h
-include/mysql/private/init.h
-include/mysql/private/innodb_priv.h
-include/mysql/private/item.h
-include/mysql/private/item_cmpfunc.h
-include/mysql/private/item_create.h
-include/mysql/private/item_func.h
-include/mysql/private/item_geofunc.h
-include/mysql/private/item_inetfunc.h
-include/mysql/private/item_row.h
-include/mysql/private/item_strfunc.h
-include/mysql/private/item_subselect.h
-include/mysql/private/item_sum.h
-include/mysql/private/item_timefunc.h
-include/mysql/private/item_xmlfunc.h
-include/mysql/private/key.h
-include/mysql/private/keycaches.h
-include/mysql/private/lex.h
-include/mysql/private/lex_symbol.h
-include/mysql/private/lock.h
-include/mysql/private/log.h
-include/mysql/private/log_event.h
-include/mysql/private/log_event_old.h
-include/mysql/private/log_slow.h
-include/mysql/private/mdl.h
-include/mysql/private/mem_root_array.h
-include/mysql/private/message.h
-include/mysql/private/multi_range_read.h
-include/mysql/private/my_apc.h
-include/mysql/private/my_decimal.h
-include/mysql/private/mysqld.h
-include/mysql/private/mysqld_suffix.h
-include/mysql/private/nt_servc.h
-include/mysql/private/opt_range.h
-include/mysql/private/opt_subselect.h
-include/mysql/private/parse_file.h
-include/mysql/private/partition_element.h
-include/mysql/private/partition_info.h
-include/mysql/private/procedure.h
-include/mysql/private/protocol.h
-include/mysql/private/records.h
-include/mysql/private/repl_failsafe.h
-include/mysql/private/replication.h
-include/mysql/private/rpl_constants.h
-include/mysql/private/rpl_filter.h
-include/mysql/private/rpl_gtid.h
-include/mysql/private/rpl_handler.h
-include/mysql/private/rpl_injector.h
-include/mysql/private/rpl_mi.h
-include/mysql/private/rpl_parallel.h
-include/mysql/private/rpl_record.h
-include/mysql/private/rpl_record_old.h
-include/mysql/private/rpl_reporting.h
-include/mysql/private/rpl_rli.h
-include/mysql/private/rpl_tblmap.h
-include/mysql/private/rpl_utility.h
-include/mysql/private/scheduler.h
-include/mysql/private/set_var.h
-include/mysql/private/slave.h
-include/mysql/private/sp.h
-include/mysql/private/sp_cache.h
-include/mysql/private/sp_head.h
-include/mysql/private/sp_pcontext.h
-include/mysql/private/sp_rcontext.h
-include/mysql/private/spatial.h
-include/mysql/private/sql_acl.h
-include/mysql/private/sql_admin.h
-include/mysql/private/sql_alter.h
-include/mysql/private/sql_analyse.h
-include/mysql/private/sql_array.h
-include/mysql/private/sql_audit.h
-include/mysql/private/sql_base.h
-include/mysql/private/sql_binlog.h
-include/mysql/private/sql_bitmap.h
-include/mysql/private/sql_bootstrap.h
-include/mysql/private/sql_cache.h
-include/mysql/private/sql_callback.h
-include/mysql/private/sql_class.h
-include/mysql/private/sql_cmd.h
-include/mysql/private/sql_connect.h
-include/mysql/private/sql_const.h
-include/mysql/private/sql_crypt.h
-include/mysql/private/sql_cursor.h
-include/mysql/private/sql_db.h
-include/mysql/private/sql_delete.h
-include/mysql/private/sql_derived.h
-include/mysql/private/sql_digest.h
-include/mysql/private/sql_digest_stream.h
-include/mysql/private/sql_do.h
-include/mysql/private/sql_error.h
-include/mysql/private/sql_explain.h
-include/mysql/private/sql_expression_cache.h
-include/mysql/private/sql_get_diagnostics.h
-include/mysql/private/sql_handler.h
-include/mysql/private/sql_help.h
-include/mysql/private/sql_hset.h
-include/mysql/private/sql_insert.h
-include/mysql/private/sql_join_cache.h
-include/mysql/private/sql_lex.h
-include/mysql/private/sql_lifo_buffer.h
-include/mysql/private/sql_list.h
-include/mysql/private/sql_load.h
-include/mysql/private/sql_locale.h
-include/mysql/private/sql_manager.h
-include/mysql/private/sql_parse.h
-include/mysql/private/sql_partition.h
-include/mysql/private/sql_partition_admin.h
-include/mysql/private/sql_plist.h
-include/mysql/private/sql_plugin.h
-include/mysql/private/sql_plugin_compat.h
-include/mysql/private/sql_plugin_services.h
-include/mysql/private/sql_prepare.h
-include/mysql/private/sql_priv.h
-include/mysql/private/sql_profile.h
-include/mysql/private/sql_reload.h
-include/mysql/private/sql_rename.h
-include/mysql/private/sql_repl.h
-include/mysql/private/sql_select.h
-include/mysql/private/sql_servers.h
-include/mysql/private/sql_show.h
-include/mysql/private/sql_signal.h
-include/mysql/private/sql_sort.h
-include/mysql/private/sql_statistics.h
-include/mysql/private/sql_string.h
-include/mysql/private/sql_table.h
-include/mysql/private/sql_tablespace.h
-include/mysql/private/sql_test.h
-include/mysql/private/sql_time.h
-include/mysql/private/sql_trigger.h
-include/mysql/private/sql_truncate.h
-include/mysql/private/sql_type_int.h
-include/mysql/private/sql_udf.h
-include/mysql/private/sql_union.h
-include/mysql/private/sql_update.h
-include/mysql/private/sql_view.h
-include/mysql/private/sql_yacc.h
-include/mysql/private/strfunc.h
-include/mysql/private/structs.h
-include/mysql/private/sys_vars.h
-include/mysql/private/sys_vars_shared.h
-include/mysql/private/table.h
-include/mysql/private/table_cache.h
-include/mysql/private/thr_malloc.h
-include/mysql/private/threadpool.h
-include/mysql/private/transaction.h
-include/mysql/private/tzfile.h
-include/mysql/private/tztime.h
-include/mysql/private/unireg.h
-include/mysql/private/winservice.h
+bin/wsrep_sst_common
+bin/wsrep_sst_mariabackup
+bin/wsrep_sst_mysqldump
+bin/wsrep_sst_rsync
+bin/wsrep_sst_rsync_wan
+bin/wsrep_sst_xtrabackup
+bin/wsrep_sst_xtrabackup-v2
+include/mysql/server/
+include/mysql/server/big_endian.h
+include/mysql/server/byte_order_generic.h
+include/mysql/server/byte_order_generic_x86.h
+include/mysql/server/byte_order_generic_x86_64.h
+include/mysql/server/decimal.h
+include/mysql/server/errmsg.h
+include/mysql/server/handler_ername.h
+include/mysql/server/handler_state.h
+include/mysql/server/json_lib.h
+include/mysql/server/keycache.h
+include/mysql/server/little_endian.h
+include/mysql/server/m_ctype.h
+include/mysql/server/m_string.h
+include/mysql/server/ma_dyncol.h
+include/mysql/server/my_alloc.h
+include/mysql/server/my_attribute.h
+include/mysql/server/my_byteorder.h
+include/mysql/server/my_compiler.h
+include/mysql/server/my_config.h
+include/mysql/server/my_dbug.h
+include/mysql/server/my_decimal_limits.h
+include/mysql/server/my_dir.h
+include/mysql/server/my_getopt.h
+include/mysql/server/my_global.h
+include/mysql/server/my_list.h
+include/mysql/server/my_net.h
+include/mysql/server/my_pthread.h
+include/mysql/server/my_sys.h
+include/mysql/server/my_valgrind.h
+include/mysql/server/my_xml.h
+include/mysql/server/mysql/
+include/mysql/server/mysql.h
+include/mysql/server/mysql/auth_dialog_client.h
+include/mysql/server/mysql/client_plugin.h
+include/mysql/server/mysql/plugin.h
+include/mysql/server/mysql/plugin_audit.h
+include/mysql/server/mysql/plugin_auth.h
+include/mysql/server/mysql/plugin_auth_common.h
+include/mysql/server/mysql/plugin_encryption.h
+include/mysql/server/mysql/plugin_ftparser.h
+include/mysql/server/mysql/plugin_password_validation.h
+include/mysql/server/mysql/psi/
+include/mysql/server/mysql/psi/mysql_file.h
+include/mysql/server/mysql/psi/mysql_idle.h
+include/mysql/server/mysql/psi/mysql_socket.h
+include/mysql/server/mysql/psi/mysql_stage.h
+include/mysql/server/mysql/psi/mysql_statement.h
+include/mysql/server/mysql/psi/mysql_table.h
+include/mysql/server/mysql/psi/mysql_thread.h
+include/mysql/server/mysql/psi/psi.h
+include/mysql/server/mysql/psi/psi_abi_v0.h
+include/mysql/server/mysql/psi/psi_abi_v1.h
+include/mysql/server/mysql/psi/psi_abi_v2.h
+include/mysql/server/mysql/psi/psi_base.h
+include/mysql/server/mysql/psi/psi_memory.h
+include/mysql/server/mysql/service_base64.h
+include/mysql/server/mysql/service_debug_sync.h
+include/mysql/server/mysql/service_encryption.h
+include/mysql/server/mysql/service_encryption_scheme.h
+include/mysql/server/mysql/service_kill_statement.h
+include/mysql/server/mysql/service_logger.h
+include/mysql/server/mysql/service_md5.h
+include/mysql/server/mysql/service_my_crypt.h
+include/mysql/server/mysql/service_my_print_error.h
+include/mysql/server/mysql/service_my_snprintf.h
+include/mysql/server/mysql/service_progress_report.h
+include/mysql/server/mysql/service_sha1.h
+include/mysql/server/mysql/service_sha2.h
+include/mysql/server/mysql/service_thd_alloc.h
+include/mysql/server/mysql/service_thd_autoinc.h
+include/mysql/server/mysql/service_thd_error_context.h
+include/mysql/server/mysql/service_thd_rnd.h
+include/mysql/server/mysql/service_thd_specifics.h
+include/mysql/server/mysql/service_thd_timezone.h
+include/mysql/server/mysql/service_thd_wait.h
+include/mysql/server/mysql/service_wsrep.h
+include/mysql/server/mysql/services.h
+include/mysql/server/mysql_com.h
+include/mysql/server/mysql_com_server.h
+include/mysql/server/mysql_embed.h
+include/mysql/server/mysql_time.h
+include/mysql/server/mysql_version.h
+include/mysql/server/mysqld_ername.h
+include/mysql/server/mysqld_error.h
+include/mysql/server/pack.h
+include/mysql/server/private/
+include/mysql/server/private/atomic/
+include/mysql/server/private/atomic/gcc_builtins.h
+include/mysql/server/private/atomic/generic-msvc.h
+include/mysql/server/private/atomic/solaris.h
+include/mysql/server/private/atomic/x86-gcc.h
+include/mysql/server/private/authors.h
+include/mysql/server/private/bounded_queue.h
+include/mysql/server/private/client_settings.h
+include/mysql/server/private/compat56.h
+include/mysql/server/private/config.h
+include/mysql/server/private/contributors.h
+include/mysql/server/private/create_options.h
+include/mysql/server/private/custom_conf.h
+include/mysql/server/private/datadict.h
+include/mysql/server/private/debug_sync.h
+include/mysql/server/private/derror.h
+include/mysql/server/private/des_key_file.h
+include/mysql/server/private/discover.h
+include/mysql/server/private/dur_prop.h
+include/mysql/server/private/event_data_objects.h
+include/mysql/server/private/event_db_repository.h
+include/mysql/server/private/event_parse_data.h
+include/mysql/server/private/event_queue.h
+include/mysql/server/private/event_scheduler.h
+include/mysql/server/private/events.h
+include/mysql/server/private/field.h
+include/mysql/server/private/filesort.h
+include/mysql/server/private/filesort_utils.h
+include/mysql/server/private/ft_global.h
+include/mysql/server/private/gcalc_slicescan.h
+include/mysql/server/private/gcalc_tools.h
+include/mysql/server/private/group_by_handler.h
+include/mysql/server/private/gstream.h
+include/mysql/server/private/ha_partition.h
+include/mysql/server/private/handler.h
+include/mysql/server/private/hash.h
+include/mysql/server/private/hash_filo.h
+include/mysql/server/private/heap.h
+include/mysql/server/private/hostname.h
+include/mysql/server/private/init.h
+include/mysql/server/private/innodb_priv.h
+include/mysql/server/private/item.h
+include/mysql/server/private/item_cmpfunc.h
+include/mysql/server/private/item_create.h
+include/mysql/server/private/item_func.h
+include/mysql/server/private/item_geofunc.h
+include/mysql/server/private/item_inetfunc.h
+include/mysql/server/private/item_jsonfunc.h
+include/mysql/server/private/item_row.h
+include/mysql/server/private/item_strfunc.h
+include/mysql/server/private/item_subselect.h
+include/mysql/server/private/item_sum.h
+include/mysql/server/private/item_timefunc.h
+include/mysql/server/private/item_windowfunc.h
+include/mysql/server/private/item_xmlfunc.h
+include/mysql/server/private/key.h
+include/mysql/server/private/keycaches.h
+include/mysql/server/private/lex.h
+include/mysql/server/private/lex_symbol.h
+include/mysql/server/private/lf.h
+include/mysql/server/private/lock.h
+include/mysql/server/private/log.h
+include/mysql/server/private/log_event.h
+include/mysql/server/private/log_event_old.h
+include/mysql/server/private/log_slow.h
+include/mysql/server/private/maria.h
+include/mysql/server/private/mdl.h
+include/mysql/server/private/mem_root_array.h
+include/mysql/server/private/message.h
+include/mysql/server/private/multi_range_read.h
+include/mysql/server/private/my_alarm.h
+include/mysql/server/private/my_apc.h
+include/mysql/server/private/my_atomic.h
+include/mysql/server/private/my_base.h
+include/mysql/server/private/my_bit.h
+include/mysql/server/private/my_bitmap.h
+include/mysql/server/private/my_check_opt.h
+include/mysql/server/private/my_compare.h
+include/mysql/server/private/my_context.h
+include/mysql/server/private/my_cpu.h
+include/mysql/server/private/my_crypt.h
+include/mysql/server/private/my_decimal.h
+include/mysql/server/private/my_default.h
+include/mysql/server/private/my_handler_errors.h
+include/mysql/server/private/my_json_writer.h
+include/mysql/server/private/my_libwrap.h
+include/mysql/server/private/my_md5.h
+include/mysql/server/private/my_nosys.h
+include/mysql/server/private/my_rdtsc.h
+include/mysql/server/private/my_rnd.h
+include/mysql/server/private/my_service_manager.h
+include/mysql/server/private/my_stacktrace.h
+include/mysql/server/private/my_time.h
+include/mysql/server/private/my_tree.h
+include/mysql/server/private/my_uctype.h
+include/mysql/server/private/my_user.h
+include/mysql/server/private/myisam.h
+include/mysql/server/private/myisamchk.h
+include/mysql/server/private/myisammrg.h
+include/mysql/server/private/myisampack.h
+include/mysql/server/private/mysql_async.h
+include/mysql/server/private/mysqld.h
+include/mysql/server/private/mysqld_default_groups.h
+include/mysql/server/private/mysqld_suffix.h
+include/mysql/server/private/mysys_err.h
+include/mysql/server/private/nt_servc.h
+include/mysql/server/private/opt_range.h
+include/mysql/server/private/opt_subselect.h
+include/mysql/server/private/parse_file.h
+include/mysql/server/private/partition_element.h
+include/mysql/server/private/partition_info.h
+include/mysql/server/private/password.h
+include/mysql/server/private/probes_mysql.h
+include/mysql/server/private/probes_mysql_nodtrace.h
+include/mysql/server/private/procedure.h
+include/mysql/server/private/protocol.h
+include/mysql/server/private/queues.h
+include/mysql/server/private/records.h
+include/mysql/server/private/repl_failsafe.h
+include/mysql/server/private/replication.h
+include/mysql/server/private/rijndael.h
+include/mysql/server/private/rpl_constants.h
+include/mysql/server/private/rpl_filter.h
+include/mysql/server/private/rpl_gtid.h
+include/mysql/server/private/rpl_handler.h
+include/mysql/server/private/rpl_injector.h
+include/mysql/server/private/rpl_mi.h
+include/mysql/server/private/rpl_parallel.h
+include/mysql/server/private/rpl_record.h
+include/mysql/server/private/rpl_record_old.h
+include/mysql/server/private/rpl_reporting.h
+include/mysql/server/private/rpl_rli.h
+include/mysql/server/private/rpl_tblmap.h
+include/mysql/server/private/rpl_utility.h
+include/mysql/server/private/scheduler.h
+include/mysql/server/private/service_versions.h
+include/mysql/server/private/session_tracker.h
+include/mysql/server/private/set_var.h
+include/mysql/server/private/slave.h
+include/mysql/server/private/sp.h
+include/mysql/server/private/sp_cache.h
+include/mysql/server/private/sp_head.h
+include/mysql/server/private/sp_pcontext.h
+include/mysql/server/private/sp_rcontext.h
+include/mysql/server/private/spatial.h
+include/mysql/server/private/sql_acl.h
+include/mysql/server/private/sql_admin.h
+include/mysql/server/private/sql_alter.h
+include/mysql/server/private/sql_analyse.h
+include/mysql/server/private/sql_analyze_stmt.h
+include/mysql/server/private/sql_array.h
+include/mysql/server/private/sql_audit.h
+include/mysql/server/private/sql_base.h
+include/mysql/server/private/sql_basic_types.h
+include/mysql/server/private/sql_binlog.h
+include/mysql/server/private/sql_bitmap.h
+include/mysql/server/private/sql_bootstrap.h
+include/mysql/server/private/sql_cache.h
+include/mysql/server/private/sql_callback.h
+include/mysql/server/private/sql_class.h
+include/mysql/server/private/sql_cmd.h
+include/mysql/server/private/sql_connect.h
+include/mysql/server/private/sql_const.h
+include/mysql/server/private/sql_crypt.h
+include/mysql/server/private/sql_cte.h
+include/mysql/server/private/sql_cursor.h
+include/mysql/server/private/sql_db.h
+include/mysql/server/private/sql_delete.h
+include/mysql/server/private/sql_derived.h
+include/mysql/server/private/sql_digest.h
+include/mysql/server/private/sql_digest_stream.h
+include/mysql/server/private/sql_do.h
+include/mysql/server/private/sql_error.h
+include/mysql/server/private/sql_explain.h
+include/mysql/server/private/sql_expression_cache.h
+include/mysql/server/private/sql_get_diagnostics.h
+include/mysql/server/private/sql_handler.h
+include/mysql/server/private/sql_help.h
+include/mysql/server/private/sql_hset.h
+include/mysql/server/private/sql_insert.h
+include/mysql/server/private/sql_join_cache.h
+include/mysql/server/private/sql_lex.h
+include/mysql/server/private/sql_lifo_buffer.h
+include/mysql/server/private/sql_list.h
+include/mysql/server/private/sql_load.h
+include/mysql/server/private/sql_locale.h
+include/mysql/server/private/sql_manager.h
+include/mysql/server/private/sql_parse.h
+include/mysql/server/private/sql_partition.h
+include/mysql/server/private/sql_partition_admin.h
+include/mysql/server/private/sql_plist.h
+include/mysql/server/private/sql_plugin.h
+include/mysql/server/private/sql_plugin_compat.h
+include/mysql/server/private/sql_prepare.h
+include/mysql/server/private/sql_priv.h
+include/mysql/server/private/sql_profile.h
+include/mysql/server/private/sql_reload.h
+include/mysql/server/private/sql_rename.h
+include/mysql/server/private/sql_repl.h
+include/mysql/server/private/sql_select.h
+include/mysql/server/private/sql_servers.h
+include/mysql/server/private/sql_show.h
+include/mysql/server/private/sql_signal.h
+include/mysql/server/private/sql_sort.h
+include/mysql/server/private/sql_statistics.h
+include/mysql/server/private/sql_string.h
+include/mysql/server/private/sql_table.h
+include/mysql/server/private/sql_tablespace.h
+include/mysql/server/private/sql_test.h
+include/mysql/server/private/sql_time.h
+include/mysql/server/private/sql_trigger.h
+include/mysql/server/private/sql_truncate.h
+include/mysql/server/private/sql_type.h
+include/mysql/server/private/sql_type_int.h
+include/mysql/server/private/sql_udf.h
+include/mysql/server/private/sql_union.h
+include/mysql/server/private/sql_update.h
+include/mysql/server/private/sql_view.h
+include/mysql/server/private/sql_window.h
+include/mysql/server/private/sql_yacc.h
+include/mysql/server/private/ssl_compat.h
+include/mysql/server/private/strfunc.h
+include/mysql/server/private/structs.h
+include/mysql/server/private/sys_vars_shared.h
+include/mysql/server/private/t_ctype.h
+include/mysql/server/private/table.h
+include/mysql/server/private/table_cache.h
+include/mysql/server/private/thr_alarm.h
+include/mysql/server/private/thr_lock.h
+include/mysql/server/private/thr_malloc.h
+include/mysql/server/private/thr_timer.h
+include/mysql/server/private/thread_pool_priv.h
+include/mysql/server/private/threadpool.h
+include/mysql/server/private/transaction.h
+include/mysql/server/private/tzfile.h
+include/mysql/server/private/tztime.h
+include/mysql/server/private/uniques.h
+include/mysql/server/private/unireg.h
+include/mysql/server/private/violite.h
+include/mysql/server/private/waiting_threads.h
+include/mysql/server/private/welcome_copyright_notice.h
+include/mysql/server/private/winservice.h
+include/mysql/server/private/wqueue.h
+include/mysql/server/private/wsrep.h
+include/mysql/server/private/wsrep_applier.h
+include/mysql/server/private/wsrep_binlog.h
+include/mysql/server/private/wsrep_mysqld.h
+include/mysql/server/private/wsrep_mysqld_c.h
+include/mysql/server/private/wsrep_priv.h
+include/mysql/server/private/wsrep_sst.h
+include/mysql/server/private/wsrep_thd.h
+include/mysql/server/private/wsrep_utils.h
+include/mysql/server/private/wsrep_var.h
+include/mysql/server/private/wsrep_xid.h
+include/mysql/server/sql_common.h
+include/mysql/server/sql_state.h
+include/mysql/server/sslopt-case.h
+include/mysql/server/sslopt-longopts.h
+include/mysql/server/sslopt-vars.h
+include/mysql/server/typelib.h
 lib/mysql/plugin/
 lib/mysql/plugin/adt_null.so
 lib/mysql/plugin/auth_0x0100.so
+lib/mysql/plugin/auth_ed25519.so
 lib/mysql/plugin/auth_socket.so
 lib/mysql/plugin/auth_test_plugin.so
+lib/mysql/plugin/caching_sha2_password.so
+lib/mysql/plugin/client_ed25519.so
 lib/mysql/plugin/daemon_example.ini
+lib/mysql/plugin/debug_key_management.so
 lib/mysql/plugin/dialog.so
 lib/mysql/plugin/dialog_examples.so
-lib/mysql/plugin/feedback.so
+lib/mysql/plugin/example_key_management.so
+lib/mysql/plugin/file_key_management.so
 lib/mysql/plugin/ha_archive.so
 lib/mysql/plugin/ha_blackhole.so
 lib/mysql/plugin/ha_connect.so
 lib/mysql/plugin/ha_example.so
 lib/mysql/plugin/ha_federated.so
 lib/mysql/plugin/ha_federatedx.so
-lib/mysql/plugin/ha_innodb.so
-lib/mysql/plugin/ha_sequence.so
 lib/mysql/plugin/ha_sphinx.so
 lib/mysql/plugin/ha_spider.so
 lib/mysql/plugin/ha_test_sql_discovery.so
@@ -248,7 +428,10 @@ lib/mysql/plugin/query_response_time.so
 lib/mysql/plugin/semisync_master.so
 lib/mysql/plugin/semisync_slave.so
 lib/mysql/plugin/server_audit.so
+lib/mysql/plugin/sha256_password.so
+lib/mysql/plugin/simple_password_check.so
 lib/mysql/plugin/sql_errlog.so
+lib/mysql/plugin/wsrep_info.so
 @bin libexec/mysqld
 @man man/man1/aria_chk.1
 @man man/man1/aria_dump_log.1
@@ -270,7 +453,6 @@ lib/mysql/plugin/sql_errlog.so
 @man man/man1/mysql_setpermission.1
 @man man/man1/mysql_tzinfo_to_sql.1
 @man man/man1/mysql_upgrade.1
-@man man/man1/mysql_zap.1
 @man man/man1/mysqld_multi.1
 @man man/man1/mysqld_safe.1
 @man man/man1/mysqlhotcopy.1
@@ -281,16 +463,14 @@ lib/mysql/plugin/sql_errlog.so
 @man man/man8/mysqld.8
 share/doc/mysql/
 share/doc/mysql/COPYING
+share/doc/mysql/COPYING.thirdparty
 share/doc/mysql/CREDITS
 share/doc/mysql/EXCEPTIONS-CLIENT
 share/doc/mysql/INSTALL-BINARY
-share/doc/mysql/README
+share/doc/mysql/README-wsrep
+share/doc/mysql/README.md
 share/doc/pkg-readmes/${PKGSTEM}
 share/examples/mysql/
-share/examples/mysql/SELinux/
-share/examples/mysql/SELinux/mariadb.te
-share/examples/mysql/SELinux/rhel4-mysql.fc
-share/examples/mysql/SELinux/rhel4-mysql.te
 share/examples/mysql/binary-configure
 share/examples/mysql/magic
 share/examples/mysql/my-huge.cnf
@@ -302,6 +482,18 @@ share/examples/mysql/my-small.cnf
 share/examples/mysql/mysql-log-rotate
 share/examples/mysql/mysql.server
 share/examples/mysql/mysqld_multi.server
+share/examples/mysql/policy/
+share/examples/mysql/policy/apparmor/
+share/examples/mysql/policy/apparmor/README
+share/examples/mysql/policy/apparmor/usr.sbin.mysqld
+share/examples/mysql/policy/apparmor/usr.sbin.mysqld.local
+share/examples/mysql/policy/selinux/
+share/examples/mysql/policy/selinux/README
+share/examples/mysql/policy/selinux/mariadb-server.fc
+share/examples/mysql/policy/selinux/mariadb-server.te
+share/examples/mysql/policy/selinux/mariadb.te
+share/examples/mysql/wsrep.cnf
+share/examples/mysql/wsrep_notify
 share/mysql/
 share/mysql/charsets/
 share/mysql/charsets/Index.xml
@@ -348,6 +540,8 @@ share/mysql/german/
 share/mysql/german/errmsg.sys
 share/mysql/greek/
 share/mysql/greek/errmsg.sys
+share/mysql/hindi/
+share/mysql/hindi/errmsg.sys
 share/mysql/hungarian/
 share/mysql/hungarian/errmsg.sys
 share/mysql/install_spider.sql
@@ -357,10 +551,13 @@ share/mysql/japanese/
 share/mysql/japanese/errmsg.sys
 share/mysql/korean/
 share/mysql/korean/errmsg.sys
+share/mysql/maria_add_gis_sp.sql
+share/mysql/maria_add_gis_sp_bootstrap.sql
 share/mysql/mysql_performance_tables.sql
 share/mysql/mysql_system_tables.sql
 share/mysql/mysql_system_tables_data.sql
 share/mysql/mysql_test_data_timezone.sql
+share/mysql/mysql_to_mariadb.sql
 share/mysql/norwegian/
 share/mysql/norwegian-ny/
 share/mysql/norwegian-ny/errmsg.sys
@@ -383,4 +580,3 @@ share/mysql/swedish/
 share/mysql/swedish/errmsg.sys
 share/mysql/ukrainian/
 share/mysql/ukrainian/errmsg.sys
-@rcscript ${RCDIR}/mysqld