$ git diff --patch-with-stat --summary 7321a3bcf6167a61d9ffe68a04e0f424faa0d0b5..07aa451c22a8c4dda4727d6bbd489109ca57a122
.abf.yml | 2 +-
mariadb-10.5.0-static-sql_builtins.patch | 12 ++++++++++++
mariadb.spec | 11 ++++++-----
3 files changed, 19 insertions(+), 6 deletions(-)
create mode 100644 mariadb-10.5.0-static-sql_builtins.patch
diff --git a/.abf.yml b/.abf.yml
index a32ce80..d497890 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- mariadb-10.4.10.tar.gz: dddaeaefb92b753c810145fa6a886a91c465837d
+ mariadb-10.5.0.tar.gz: be40d916e0b1301b358b61fe756c64d397824452
diff --git a/mariadb-10.5.0-static-sql_builtins.patch b/mariadb-10.5.0-static-sql_builtins.patch
new file mode 100644
index 0000000..7d6a216
--- /dev/null
+++ b/mariadb-10.5.0-static-sql_builtins.patch
@@ -0,0 +1,12 @@
+diff -up mariadb-10.5.0/sql/CMakeLists.txt.omv~ mariadb-10.5.0/sql/CMakeLists.txt
+--- mariadb-10.5.0/sql/CMakeLists.txt.omv~ 2019-12-12 16:21:55.940907806 +0100
++++ mariadb-10.5.0/sql/CMakeLists.txt 2019-12-12 16:22:12.509906721 +0100
+@@ -277,7 +277,7 @@ IF(MSVC AND NOT WITHOUT_DYNAMIC_PLUGINS)
+ SET_TARGET_PROPERTIES(mysqld_import_lib PROPERTIES IMPORTED_LOCATION ${MYSQLD_LIB})
+ ENDIF()
+
+-ADD_LIBRARY( sql_builtins ${CMAKE_CURRENT_BINARY_DIR}/sql_builtin.cc)
++ADD_LIBRARY( sql_builtins STATIC ${CMAKE_CURRENT_BINARY_DIR}/sql_builtin.cc)
+ TARGET_LINK_LIBRARIES(sql_builtins ${MYSQLD_STATIC_PLUGIN_LIBS})
+
+ MYSQL_ADD_EXECUTABLE(mysqld ${MYSQLD_SOURCE} DESTINATION ${INSTALL_SBINDIR} COMPONENT Server)
diff --git a/mariadb.spec b/mariadb.spec
index a3571bd..3d63f0e 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -11,8 +11,8 @@
Summary: The MariaDB database, a drop-in replacement for MySQL
Name: mariadb
-Version: 10.4.10
-Release: 1
+Version: 10.5.0
+Release: 3
URL: http://mariadb.org/
License: GPL
Group: System/Servers
@@ -46,6 +46,7 @@ Patch8: mariadb-scripts.patch
# It also doesn't have soname info etc., so it should be a static
# lib
Patch9: mariadb-10.4.4-static-wsrep.patch
+Patch10: mariadb-10.5.0-static-sql_builtins.patch
Patch12: cmake-pcre.cmake.patch
Requires: %{name}-server = %{EVRD}
Requires: %{name}-client = %{EVRD}
@@ -243,9 +244,6 @@ Plugins for the MariaDB database.
%dir %{_libdir}/mysql/plugin/auth_pam_tool_dir
%{_libdir}/mysql/plugin/auth_pam_tool_dir/auth_pam_tool
%{_libdir}/mysql/plugin/auth_pam_v1.so
-%ifarch %{x86_64}
-%{_libdir}/mysql/plugin/ha_tokudb.so
-%endif
%{_libdir}/mysql/plugin/caching_sha2_password.so
%{_libdir}/mysql/plugin/client_ed25519.so
%{_libdir}/mysql/plugin/cracklib_password_check.so
@@ -337,6 +335,8 @@ MariaDB test suite.
%{_mandir}/man1/mariadb-client-test.1*
%{_bindir}/mysql_client_test_embedded
%{_datadir}/mysql-test
+%{_libdir}/mysql/plugin/func_test.so
+%{_libdir}/mysql/plugin/type_test.so
%{_mandir}/man1/mariadb-test.1*
%{_mandir}/man1/mysql-stress-test.pl.1*
%{_mandir}/man1/mysql-test-run.pl.1*
@@ -726,6 +726,7 @@ sed -i -e "s,/usr/lib/systemd/system,%{_unitdir},g" cmake/install_layout.cmake
-DDISABLE_LIBMYSQLCLIENT_SYMBOL_VERSIONING:BOOL=ON \
-DINSTALL_PLUGINDIR="%{_libdir}/mysql/plugin" \
-DINSTALL_LIBDIR="%{_libdir}" \
+ -DPLUGIN_TOKUDB:BOOL=DYNAMIC \
-DMYSQL_DATADIR=/srv/mysql \
-DMYSQL_UNIX_ADDR=/run/mysqld/mysql.sock \
-DPID_FILE_DIR="/run/mysqld" \