databases/mariadb103-server: Mark broken

 - And merge 10.3.8 changes for -client

2 files changed, 0 insertions, 21 deletions

diff --git a/databases/mariadb103-server/files/patch-sql-common_client.c b/databases/mariadb103-server/files/patch-sql-common_client.c
deleted file mode 100644
index ad77fc7f4321..000000000000
--- a/databases/mariadb103-server/files/patch-sql-common_client.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- sql-common/client.c.orig	2017-05-14 23:13:18 UTC
-+++ sql-common/client.c
-@@ -104,6 +104,10 @@ my_bool	net_flush(NET *net);
- #define CONNECT_TIMEOUT 0
- #endif
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) || defined(HAVE_YASSL)
-+#define ASN1_STRING_get0_data(X) ASN1_STRING_data(X)
-+#endif
-+
- #include "client_settings.h"
- #include <ssl_compat.h>
- #include <sql_common.h>
diff --git a/databases/mariadb103-server/files/patch-sql_mysqld.cc b/databases/mariadb103-server/files/patch-sql_mysqld.cc
index 360b1f4117b6..ab4a1ed810a5 100644
--- a/databases/mariadb103-server/files/patch-sql_mysqld.cc
+++ b/databases/mariadb103-server/files/patch-sql_mysqld.cc
@@ -1,13 +1,5 @@
 --- sql/mysqld.cc.orig	2017-05-14 23:13:18 UTC
 +++ sql/mysqld.cc
-@@ -120,6 +121,7 @@
- #define HAVE_CLOSE_SERVER_SOCK 1
- #endif
- 
-+
- extern "C" {					// Because of SCO 3.2V4.2
- #include <sys/stat.h>
- #ifndef __GNU_LIBRARY__
 @@ -4838,8 +4840,9 @@ static void init_ssl()
        while ((err= ERR_get_error()))
          sql_print_warning("SSL error: %s", ERR_error_string(err, NULL));