From a68c79f1514e25c844d0f2e0996745e1a94c79db Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm@redhat.com>
Date: Wed, 22 Jan 2020 13:13:33 +0100
Subject: [PATCH] Rebase to 10.5.0 - Alpha

---
 mariadb-10.5.0-libsql_builtins.patch | 14 ++++++++++++++
 mariadb.spec                         | 12 +++++++++---
 sources                              |  2 +-
 3 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 mariadb-10.5.0-libsql_builtins.patch

diff --git a/mariadb-10.5.0-libsql_builtins.patch b/mariadb-10.5.0-libsql_builtins.patch
new file mode 100644
index 0000000..b29ddba
--- /dev/null
+++ b/mariadb-10.5.0-libsql_builtins.patch
@@ -0,0 +1,14 @@
+Based on this upstream commit:
+https://github.com/MariaDB/server/commit/92d6c13206b199f24384ed2504ed479b0f59c314
+
+--- mariadb-10.5.0/sql/CMakeLists.txt	2019-11-28 16:19:01.000000000 +0100
++++ mariadb-10.5.0/sql/CMakeLists.txt_patched	2020-01-22 00:52:28.858844312 +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 b0dfbdf..496adde 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -146,8 +146,8 @@
 %global sameevr   %{epoch}:%{version}-%{release}
 
 Name:             mariadb
-Version:          10.4.12
-Release:          5%{?with_debug:.debug}%{?dist}
+Version:          10.5.0
+Release:          1%{?with_debug:.debug}%{?dist}
 Epoch:            3
 
 Summary:          A very fast and robust SQL database server
@@ -199,6 +199,8 @@ Patch13:          %{pkgnamepatch}-spider_on_armv7hl.patch
 Patch15:          %{pkgnamepatch}-groonga.patch
 #   Patch16: Workaround for "chown 0" with priviledges dropped to "mysql" user
 Patch16:          %{pkgnamepatch}-auth_pam_tool_dir.patch
+#   Patch17: Fix of an upstream bug. Fixed in the next (10.5.1) version.
+Patch17:          %{pkgnamepatch}-10.5.0-libsql_builtins.patch
 
 BuildRequires:    cmake gcc-c++
 BuildRequires:    multilib-rpm-config
@@ -703,9 +705,10 @@ rm -rf libmariadb/unittest
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%patch13 -p1
+#%patch13 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 # workaround for upstream bug #56342
 #rm mysql-test/t/ssl_8k_key-master.opt
@@ -1592,6 +1595,9 @@ fi
 %endif
 
 %changelog
+* Thu Apr 09 2020 Michal Schorm <mschorm@redhat.com> - 10.5.0-1
+- Test rebase to 10.5.0 - Alpha
+
 * Thu Apr 02 2020 Björn Esser <besser82@fedoraproject.org> - 3:10.4.12-5
 - Fix string quoting for rpm >= 4.16
 
diff --git a/sources b/sources
index 5a2560f..96ad160 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mariadb-10.4.12.tar.gz) = f26c45bbab765c979bbdb748da10ee314c1494e2ad7df7523bf4020b5f5036c06242739c1877fa0a21defcdd27f498cfff730289486ce9ced09d5740f3594657
+SHA512 (mariadb-10.5.0.tar.gz) = ed7226a0e0b8d0aa435691a43f457bf338b484fc2dd893b8490c65bf99915a089e6c91a86687ef2eaa3728d83a91f5c0dfd7b8ddbefec79f9ad4cd7074bda4c5