databases/mariadb102-server: Update to 10.2.9

13 files changed, 88 insertions, 218 deletions

diff --git a/databases/mariadb102-client/Makefile b/databases/mariadb102-client/Makefile
index 59d0b0a..ef123c0 100644
--- a/databases/mariadb102-client/Makefile
+++ b/databases/mariadb102-client/Makefile
@@ -23,7 +23,7 @@ CLIENT_ONLY=	yes
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4
 	${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig
-	${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/private
+	${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server
 	${RM} -r ${STAGEDIR}${DATADIR}/policy
 	${RM} ${STAGEDIR}${PREFIX}/man/man1/aria* ${STAGEDIR}${PREFIX}/man/man1/myisam*
 	# Fix https://mariadb.atlassian.net/browse/MDEV-9388
diff --git a/databases/mariadb102-client/files/patch-include_CMakeLists.txt b/databases/mariadb102-client/files/patch-include_CMakeLists.txt
index cb95177..159c833 100644
--- a/databases/mariadb102-client/files/patch-include_CMakeLists.txt
+++ b/databases/mariadb102-client/files/patch-include_CMakeLists.txt
@@ -1,16 +1,17 @@
---- include/CMakeLists.txt.orig	2017-04-04 19:11:34 UTC
+--- include/CMakeLists.txt.orig	2017-08-17 10:05:38 UTC
 +++ include/CMakeLists.txt
-@@ -73,11 +73,13 @@ INSTALL(DIRECTORY mysql/ DESTINATION ${I
- STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}")
+@@ -80,12 +80,14 @@ STRING(REPLACE "." "\\." EXCL_RE "${HEAD
  STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}")
  
+ MACRO(INSTALL_PRIVATE DIR)
 +IF(FALSE)
- INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
-   FILES_MATCHING PATTERN "*.h"
-   PATTERN CMakeFiles EXCLUDE
-   PATTERN mysql EXCLUDE
-   REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
+   INSTALL(DIRECTORY ${DIR}/.
+     DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development
+     FILES_MATCHING PATTERN "*.h"
+     PATTERN CMakeFiles EXCLUDE
+     PATTERN mysql EXCLUDE
+     REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
 +ENDIF()
+ ENDMACRO()
  
- INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/. DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
-   FILES_MATCHING PATTERN "*.h"
+ INSTALL_PRIVATE(${CMAKE_CURRENT_BINARY_DIR})
diff --git a/databases/mariadb102-client/pkg-plist b/databases/mariadb102-client/pkg-plist
index 3cff799..3528e70 100644
--- a/databases/mariadb102-client/pkg-plist
+++ b/databases/mariadb102-client/pkg-plist
@@ -11,22 +11,7 @@ bin/mysqlimport
 bin/mysqlshow
 bin/mysqlslap
 bin/mysql_config
-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/json_lib.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/ma_list.h
 include/mysql/ma_pvio.h
 include/mysql/ma_tls.h
@@ -36,82 +21,11 @@ include/mysql/mariadb_ctype.h
 include/mysql/mariadb_dyncol.h
 include/mysql/mariadb_stmt.h
 include/mysql/mariadb_version.h
-include/mysql/my_alloc.h
-include/mysql/my_attribute.h
-include/mysql/my_byteorder.h
-include/mysql/my_compiler.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.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/mysql/client_plugin.h
 include/mysql/mysql/plugin_auth.h
 include/mysql/mysql/plugin_auth_common.h
-include/mysql/pack.h
-include/mysql/plugin.h
-include/mysql/plugin_audit.h
-include/mysql/plugin_auth.h
-include/mysql/plugin_auth_common.h
-include/mysql/plugin_encryption.h
-include/mysql/plugin_ftparser.h
-include/mysql/plugin_password_validation.h
-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/psi/psi_base.h
-include/mysql/psi/psi_memory.h
-include/mysql/service_base64.h
-include/mysql/service_debug_sync.h
-include/mysql/service_encryption.h
-include/mysql/service_encryption_scheme.h
-include/mysql/service_kill_statement.h
-include/mysql/service_logger.h
-include/mysql/service_md5.h
-include/mysql/service_my_crypt.h
-include/mysql/service_my_print_error.h
-include/mysql/service_my_snprintf.h
-include/mysql/service_progress_report.h
-include/mysql/service_sha1.h
-include/mysql/service_sha2.h
-include/mysql/service_thd_alloc.h
-include/mysql/service_thd_autoinc.h
-include/mysql/service_thd_error_context.h
-include/mysql/service_thd_rnd.h
-include/mysql/service_thd_specifics.h
-include/mysql/service_thd_timezone.h
-include/mysql/service_thd_wait.h
-include/mysql/service_wsrep.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
+@comment include/mysql/mysqld_error.h
 %%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so
 lib/mysql/libmariadb.so
 lib/mysql/libmariadb.so.3
@@ -161,6 +75,7 @@ lib/mysql/plugin/sha256_password.so
 %%DATADIR%%/french/errmsg.sys
 %%DATADIR%%/german/errmsg.sys
 %%DATADIR%%/greek/errmsg.sys
+%%DATADIR%%/hindi/errmsg.sys
 %%DATADIR%%/hungarian/errmsg.sys
 %%DATADIR%%/italian/errmsg.sys
 %%DATADIR%%/japanese/errmsg.sys
diff --git a/databases/mariadb102-server/Makefile b/databases/mariadb102-server/Makefile
index 4eb9300..cb50175 100644
--- a/databases/mariadb102-server/Makefile
+++ b/databases/mariadb102-server/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.2.7
-PORTREVISION?=	3
+PORTVERSION=	10.2.9
+PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
 		http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
diff --git a/databases/mariadb102-server/distinfo b/databases/mariadb102-server/distinfo
index d11a061..22b0a61 100644
--- a/databases/mariadb102-server/distinfo
+++ b/databases/mariadb102-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499877512
-SHA256 (mariadb-10.2.7.tar.gz) = 225ba1bbc48325ad38a9f433ff99da4641028f42404a29591cc370e4a676c0bc
-SIZE (mariadb-10.2.7.tar.gz) = 67669554
+TIMESTAMP = 1506627462
+SHA256 (mariadb-10.2.9.tar.gz) = 12e0a01c52591ee77cf0f940fe65df024457fa16c70f08c6116048d576096124
+SIZE (mariadb-10.2.9.tar.gz) = 70858881
diff --git a/databases/mariadb102-server/files/patch-include_CMakeLists.txt b/databases/mariadb102-server/files/patch-include_CMakeLists.txt
index bae4fbb..aaa3ab9 100644
--- a/databases/mariadb102-server/files/patch-include_CMakeLists.txt
+++ b/databases/mariadb102-server/files/patch-include_CMakeLists.txt
@@ -1,27 +1,38 @@
---- include/CMakeLists.txt.orig	2017-05-14 23:13:15 UTC
+--- include/CMakeLists.txt.orig	2017-08-17 10:05:38 UTC
 +++ include/CMakeLists.txt
-@@ -64,20 +64,24 @@ SET(HEADERS 
-   json_lib.h
- )
+@@ -1,5 +1,5 @@
+ # Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+-# 
++#
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; version 2 of the License.
+@@ -68,6 +68,7 @@ SET(HEADERS 
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h
+   DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
  
 +IF(FALSE)
- INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
+ INSTALL(FILES ${HEADERS}
+   DESTINATION ${INSTALL_INCLUDEDIR}/server COMPONENT Development)
  FOREACH(f ${HEADERS_GEN_CONFIGURE})
-   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+@@ -75,17 +76,20 @@ FOREACH(f ${HEADERS_GEN_CONFIGURE})
+     DESTINATION ${INSTALL_INCLUDEDIR}/server COMPONENT Development)
  ENDFOREACH(f)
- INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h")
+ INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/server/mysql COMPONENT Development FILES_MATCHING PATTERN "*.h")
 +ENDIF()
  
  STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}")
  STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}")
  
+ MACRO(INSTALL_PRIVATE DIR)
 +IF(FALSE)
- INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
-   FILES_MATCHING PATTERN "*.h"
-   PATTERN CMakeFiles EXCLUDE
-   PATTERN mysql EXCLUDE
-   REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
+   INSTALL(DIRECTORY ${DIR}/.
+     DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development
+     FILES_MATCHING PATTERN "*.h"
+     PATTERN CMakeFiles EXCLUDE
+     PATTERN mysql EXCLUDE
+     REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
 +ENDIF()
+ ENDMACRO()
  
- INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/. DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
-   FILES_MATCHING PATTERN "*.h"
+ INSTALL_PRIVATE(${CMAKE_CURRENT_BINARY_DIR})
diff --git a/databases/mariadb102-server/files/patch-pcre_CMakeLists.txt b/databases/mariadb102-server/files/patch-pcre_CMakeLists.txt
index 8efeb81..c09bb5f 100644
--- a/databases/mariadb102-server/files/patch-pcre_CMakeLists.txt
+++ b/databases/mariadb102-server/files/patch-pcre_CMakeLists.txt
@@ -1,13 +1,11 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
---- pcre/CMakeLists.txt.orig	2017-05-14 23:13:17 UTC
+--- pcre/CMakeLists.txt.orig	2017-08-17 10:05:39 UTC
 +++ pcre/CMakeLists.txt
 @@ -510,6 +510,8 @@ IF(PCRE_SHOW_REPORT)
    MESSAGE(STATUS "")
  ENDIF(PCRE_SHOW_REPORT)
  
 +IF(FALSE)
- INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development)
+ INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development)
 +ENDIF()
  
  # end CMakeLists.txt
diff --git a/databases/mariadb102-server/files/patch-sql_CMakeLists.txt b/databases/mariadb102-server/files/patch-sql_CMakeLists.txt
index e411d0f..7e20f9f 100644
--- a/databases/mariadb102-server/files/patch-sql_CMakeLists.txt
+++ b/databases/mariadb102-server/files/patch-sql_CMakeLists.txt
@@ -1,8 +1,6 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
---- sql/CMakeLists.txt.orig	2017-05-14 23:13:18 UTC
+--- sql/CMakeLists.txt.orig	2017-08-17 10:05:40 UTC
 +++ sql/CMakeLists.txt
-@@ -379,6 +379,7 @@ ADD_CUSTOM_TARGET(distclean
+@@ -386,6 +386,7 @@ ADD_CUSTOM_TARGET(distclean
    VERBATIM
    )
  
@@ -10,7 +8,7 @@ Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
  IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
  
  # Copy db.opt into data/test/
-@@ -422,6 +423,7 @@ ELSE()
+@@ -429,6 +430,7 @@ ELSE()
    INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
  ENDIF(WIN32 AND MYSQLD_EXECUTABLE)
  ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE")
@@ -18,12 +16,12 @@ Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
  
  IF(WIN32)
    SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql)
-@@ -465,7 +467,9 @@ IF(WIN32)
+@@ -472,7 +474,9 @@ IF(WIN32)
    TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice)
  ENDIF(WIN32)
  
 +IF(FALSE)
- INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
+ INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development
    FILES_MATCHING PATTERN "*.h"
    PATTERN share EXCLUDE
    PATTERN CMakeFiles EXCLUDE)
diff --git a/databases/mariadb102-server/files/patch-storage_rocksdb_rdb__datadic.h b/databases/mariadb102-server/files/patch-storage_rocksdb_rdb__datadic.h
new file mode 100644
index 0000000..4dab8ea
--- /dev/null
+++ b/databases/mariadb102-server/files/patch-storage_rocksdb_rdb__datadic.h
@@ -0,0 +1,10 @@
+--- storage/rocksdb/rdb_datadic.h.orig	2017-09-25 06:33:26 UTC
++++ storage/rocksdb/rdb_datadic.h
+@@ -16,6 +16,7 @@
+ #pragma once
+ 
+ /* C++ standard header files */
++#include <cstdlib>
+ #include <algorithm>
+ #include <atomic>
+ #include <map>
diff --git a/databases/mariadb102-server/files/patch-storage_rocksdb_rocksdb_db_db__impl.cc b/databases/mariadb102-server/files/patch-storage_rocksdb_rocksdb_db_db__impl.cc
deleted file mode 100644
index 3b89cba..0000000
--- a/databases/mariadb102-server/files/patch-storage_rocksdb_rocksdb_db_db__impl.cc
+++ /dev/null
@@ -1,23 +0,0 @@
---- storage/rocksdb/rocksdb/db/db_impl.cc.orig	2017-05-25 21:54:40 UTC
-+++ storage/rocksdb/rocksdb/db/db_impl.cc
-@@ -18,7 +18,7 @@
- #ifdef OS_SOLARIS
- #include <alloca.h>
- #endif
--#ifdef ROCKSDB_JEMALLOC
-+#if defined(ROCKSDB_JEMALLOC) && !defined(__FreeBSD__)
- #include "jemalloc/jemalloc.h"
- #endif
- 
-@@ -400,7 +400,11 @@ static void DumpMallocStats(std::string*
-   std::unique_ptr<char[]> buf{new char[kMallocStatusLen + 1]};
-   mstat.cur = buf.get();
-   mstat.end = buf.get() + kMallocStatusLen;
-+#ifdef __FreeBSD__
-+  __malloc_stats_print(GetJemallocStatus, &mstat, "");
-+#else
-   je_malloc_stats_print(GetJemallocStatus, &mstat, "");
-+#endif
-   stats->append(buf.get());
- #endif  // ROCKSDB_JEMALLOC
- }
diff --git a/databases/mariadb102-server/files/patch-storage_rocksdb_rocksdb_db_malloc__stats.cc b/databases/mariadb102-server/files/patch-storage_rocksdb_rocksdb_db_malloc__stats.cc
new file mode 100644
index 0000000..0114e08
--- /dev/null
+++ b/databases/mariadb102-server/files/patch-storage_rocksdb_rocksdb_db_malloc__stats.cc
@@ -0,0 +1,15 @@
+--- storage/rocksdb/rocksdb/db/malloc_stats.cc.orig	2017-08-17 10:05:38 UTC
++++ storage/rocksdb/rocksdb/db/malloc_stats.cc
+@@ -16,7 +16,12 @@
+ namespace rocksdb {
+ 
+ #ifdef ROCKSDB_JEMALLOC
++#ifdef __FreeBSD__
++#include <malloc_np.h>
++#define je_malloc_stats_print malloc_stats_print
++#else
+ #include "jemalloc/jemalloc.h"
++#endif
+ 
+ typedef struct {
+   char* cur;
diff --git a/databases/mariadb102-server/files/patch-storage_tokudb_CMakeLists.txt b/databases/mariadb102-server/files/patch-storage_tokudb_CMakeLists.txt
index a8a1ce2..e758135 100644
--- a/databases/mariadb102-server/files/patch-storage_tokudb_CMakeLists.txt
+++ b/databases/mariadb102-server/files/patch-storage_tokudb_CMakeLists.txt
@@ -1,12 +1,9 @@
---- storage/tokudb/CMakeLists.txt.orig	2017-05-14 23:13:20 UTC
-+++ storage/tokudb/CMakeLists.txt
-@@ -108,9 +108,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA
+--- storage/tokudb/CMakeLists.txt.orig	2017-09-25 08:33:26.000000000 +0200
++++ storage/tokudb/CMakeLists.txt	2017-09-28 21:46:55.119327000 +0200
+@@ -108,6 +108,3 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA
+ 
  TARGET_LINK_LIBRARIES(tokudb tokufractaltree_static tokuportability_static
                        ${ZLIB_LIBRARY} ${LIBJEMALLOC} stdc++)
- 
+-
 -SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -fuse-linker-plugin")
 -SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} -flto -fuse-linker-plugin")
--
- IF (INSTALL_SYSCONF2DIR)
-   INSTALL(FILES tokudb.cnf DESTINATION ${INSTALL_SYSCONF2DIR}
-           COMPONENT tokudb-engine)
diff --git a/databases/mariadb102-server/pkg-plist b/databases/mariadb102-server/pkg-plist
index 004c0f1..5bbed29 100644
--- a/databases/mariadb102-server/pkg-plist
+++ b/databases/mariadb102-server/pkg-plist
@@ -44,65 +44,13 @@ 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/solaris.h
-include/mysql/private/atomic/x86-gcc.h
-include/mysql/private/config.h
-include/mysql/private/dur_prop.h
-include/mysql/private/embedded_priv.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_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/ssl_compat.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
+include/mysql/my_config.h
+include/mysql/my_global.h
+include/mysql/my_sys.h
+include/mysql/mysql_com.h
+include/mysql/mysql_version.h
+include/mysql/mysqld_error.h
+include/mysql/server/private/embedded_priv.h
 @comment lib/mysql/libmariadb.so
 @comment lib/mysql/libmariadb.so.3
 @comment lib/mysql/libmariadbclient.a