From c146b856c0762939f5f305ca06159f7b5a12c76d Mon Sep 17 00:00:00 2001 From: Bernard Spil Date: Thu, 12 Jul 2018 12:19:35 +0000 Subject: databases/mariadb103-server: Fix segfault - Add segfault fix from upstream [1] - Add WSREP option (default on) - Rework some of the -client conflicts - Fix LOCALBASE and PREFIX in patches - Remove unneeded patches PR: 229219 [1] Reported by: Ralf van der Enden MFH: 2018Q3 --- databases/mariadb103-server/files/patch-sql_slave.cc | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 databases/mariadb103-server/files/patch-sql_slave.cc (limited to 'databases/mariadb103-server/files/patch-sql_slave.cc') diff --git a/databases/mariadb103-server/files/patch-sql_slave.cc b/databases/mariadb103-server/files/patch-sql_slave.cc deleted file mode 100644 index a5c8d6649650..000000000000 --- a/databases/mariadb103-server/files/patch-sql_slave.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- sql/slave.cc.orig 2017-05-14 23:13:18 UTC -+++ sql/slave.cc -@@ -14,6 +14,11 @@ - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ - -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#define ERR_remove_state(X) -+#elif defined(HAVE_ERR_remove_thread_state) -+#define ERR_remove_state(X) ERR_remove_thread_state(NULL) -+#endif - - /** - @addtogroup Replication -- cgit v1.2.3