mariadb105: Add SunOS patch from OmniOS. Remove tokudb patches.

TokuDB is not built (it's removed in newer MariaDB)  so having patches
for it is quite redundant.

6 files changed, 18 insertions, 91 deletions

diff --git a/databases/mariadb105-client/distinfo b/databases/mariadb105-client/distinfo
index 6bd90536be9..ba16195a5e0 100644
--- a/databases/mariadb105-client/distinfo
+++ b/databases/mariadb105-client/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2021/08/07 07:48:28 nia Exp $
+$NetBSD: distinfo,v 1.6 2021/08/07 09:24:07 nia Exp $
 
 SHA1 (mariadb-10.5.12.tar.gz) = 0e2ca328fdd2821c7a4400f7759cd6882a2c5840
 RMD160 (mariadb-10.5.12.tar.gz) = cfac6715b84ce1ed8e073fefad90c47875a0346b
@@ -15,14 +15,11 @@ SHA1 (patch-plugin_auth__socket_CMakeLists.txt) = 00cfaf5826cc97084bc77033985e66
 SHA1 (patch-plugin_auth__socket_auth__socket.c) = 850e94faff382a7e962f6d4d6ff960ddddc624c4
 SHA1 (patch-scripts_CMakeLists.txt) = b11f36e845716fccd455832b648f20413cd9de1f
 SHA1 (patch-scripts_mysqld__safe.sh) = 4124e4c8df1527049f5eec9f3d2d4bbe80e7c33f
+SHA1 (patch-sql_mysqld.cc) = 19d325124cde1b45376c9710cdd104dc460f4bea
 SHA1 (patch-storage_connect_ioapi.c) = 804e2d9d3722fbe4d5ed773cc98a4114fe4cf8a3
 SHA1 (patch-storage_connect_tabvct.cpp) = 2e3c7cd7e4b0a86d443da47d3cc514b8b276d836
 SHA1 (patch-storage_rocksdb_rdb__io__watchdog.cc) = 85ee5007cfda0d3070ec20b2b774738b01f8e083
 SHA1 (patch-storage_rocksdb_rdb__io__watchdog.h) = d790c092d7d35d014c5ef209635c18614c3a8301
 SHA1 (patch-storage_rocksdb_rocksdb_Makefile) = 67ea4d154f4f623fdca739f50b236c973e118a12
 SHA1 (patch-storage_rocksdb_rocksdb_build__tools_fb__compile__mongo.sh) = 3b632521c23765c39f4638dc7a80d04b9e1d58bd
-SHA1 (patch-storage_tokudb_PerconaFT_portability_file.cc) = 830b4c6b20713c811fcd847c1e1abfd8441d0d4a
-SHA1 (patch-storage_tokudb_PerconaFT_portability_toku__htod.h) = 66635f0f79310bb3b2975c64ba6432e9a40ece70
-SHA1 (patch-storage_tokudb_PerconaFT_portability_toku__portability.h) = 75ede1251371eb467901a59672d39443d8c28031
-SHA1 (patch-storage_tokudb_PerconaFT_src_CMakeLists.txt) = 3a9fb10c8515d256a9d58f18605733840bba1039
 SHA1 (patch-support-files_mysql.server.sh) = a98d82cdda1dbd5ef8ebb7e457bb51661b5fd275
diff --git a/databases/mariadb105-client/patches/patch-sql_mysqld.cc b/databases/mariadb105-client/patches/patch-sql_mysqld.cc
new file mode 100644
index 00000000000..a08b187acd7
--- /dev/null
+++ b/databases/mariadb105-client/patches/patch-sql_mysqld.cc
@@ -0,0 +1,16 @@
+$NetBSD: patch-sql_mysqld.cc,v 1.1 2021/08/07 09:24:07 nia Exp $
+
+Add missing declaration of "concurrency".
+Fixes build on illumos. From OmniOS CE.
+
+--- sql/mysqld.cc.orig	2021-08-03 14:48:41.000000000 +0000
++++ sql/mysqld.cc
+@@ -443,7 +443,7 @@ Atomic_counter<uint32_t> THD_count::coun
+ bool shutdown_wait_for_slaves;
+ Atomic_counter<uint32_t> slave_open_temp_tables;
+ ulong thread_created;
+-ulong back_log, connect_timeout, server_id;
++ulong back_log, connect_timeout, concurrency, server_id;
+ ulong what_to_log;
+ ulong slow_launch_time;
+ ulong open_files_limit, max_binlog_size;
diff --git a/databases/mariadb105-client/patches/patch-storage_tokudb_PerconaFT_portability_file.cc b/databases/mariadb105-client/patches/patch-storage_tokudb_PerconaFT_portability_file.cc
deleted file mode 100644
index 51792f345c7..00000000000
--- a/databases/mariadb105-client/patches/patch-storage_tokudb_PerconaFT_portability_file.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-storage_tokudb_PerconaFT_portability_file.cc,v 1.1 2021/05/23 15:32:47 nia Exp $
-
-Add directio support on SunOS.
-
---- storage/tokudb/PerconaFT/portability/file.cc.orig	2015-02-25 15:40:56.000000000 +0000
-+++ storage/tokudb/PerconaFT/portability/file.cc
-@@ -373,6 +373,9 @@ toku_os_open_direct(const char *path, in
-             perror("setting F_NOCACHE");
-         }
-     }
-+#elif defined(__sun)
-+    rval = toku_os_open(path, oflag, mode);
-+    directio(rval, DIRECTIO_ON);
- #else
- # error "No direct I/O implementation found."
- #endif
diff --git a/databases/mariadb105-client/patches/patch-storage_tokudb_PerconaFT_portability_toku__htod.h b/databases/mariadb105-client/patches/patch-storage_tokudb_PerconaFT_portability_toku__htod.h
deleted file mode 100644
index 6fd484258a0..00000000000
--- a/databases/mariadb105-client/patches/patch-storage_tokudb_PerconaFT_portability_toku__htod.h
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-storage_tokudb_PerconaFT_portability_toku__htod.h,v 1.1 2021/05/23 15:32:47 nia Exp $
-
-Detect endianness on SunOS.
-
---- storage/tokudb/PerconaFT/portability/toku_htod.h.orig	2020-01-26 20:43:56.000000000 +0000
-+++ storage/tokudb/PerconaFT/portability/toku_htod.h
-@@ -59,11 +59,23 @@ Copyright (c) 2006, 2015, Percona and/or
- 
- #if defined(HAVE_ENDIAN_H)
- # include <endian.h>
-+#define __BYTE_ORDER BYTE_ORDER
-+#define __LITTLE_ENDIAN LITTLE_ENDIAN
-+#define __BIG_ENDIAN BIG_ENDIAN
- #elif defined(HAVE_MACHINE_ENDIAN_H)
- # include <machine/endian.h>
- # define __BYTE_ORDER __DARWIN_BYTE_ORDER
- # define __LITTLE_ENDIAN __DARWIN_LITTLE_ENDIAN
- # define __BIG_ENDIAN __DARWIN_BIG_ENDIAN
-+#elif defined(__sun)
-+# include <sys/isa_defs.h>
-+# define __BIG_ENDIAN 4321
-+# define __LITTLE_ENDIAN 1234
-+# if defined(_BIG_ENDIAN)
-+#  define __BYTE_ORDER __BIG_ENDIAN
-+# else
-+#  define __BYTE_ORDER __LITTLE_ENDIAN
-+# endif
- #endif
- #if !defined(__BYTE_ORDER) || \
-     !defined(__LITTLE_ENDIAN) || \
diff --git a/databases/mariadb105-client/patches/patch-storage_tokudb_PerconaFT_portability_toku__portability.h b/databases/mariadb105-client/patches/patch-storage_tokudb_PerconaFT_portability_toku__portability.h
deleted file mode 100644
index 9e32e943536..00000000000
--- a/databases/mariadb105-client/patches/patch-storage_tokudb_PerconaFT_portability_toku__portability.h
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-storage_tokudb_PerconaFT_portability_toku__portability.h,v 1.1 2021/05/23 15:32:47 nia Exp $
-
-Use proper attribute syntax on SunOS.
-
---- storage/tokudb/PerconaFT/portability/toku_portability.h.orig	2015-02-25 15:40:56.000000000 +0000
-+++ storage/tokudb/PerconaFT/portability/toku_portability.h
-@@ -200,7 +200,7 @@ int      _dup2(int fd, int fd2)
- #undef strdup
- #    if defined(__FreeBSD__)
- char*    strdup(const char *)         __malloc_like __attribute__((__deprecated__));
--#    elif defined(__APPLE__)
-+#    elif defined(__APPLE__) || defined(__sun)
- char*    strdup(const char *)         __attribute__((__deprecated__));
- #    else
- char*    strdup(const char *)         __THROW __attribute_malloc__ __nonnull ((1)) __attribute__((__deprecated__));
-@@ -216,7 +216,7 @@ ssize_t  pwrite(int, const void *, size_
- extern void *malloc(size_t)                    __malloc_like __attribute__((__deprecated__));
- extern void free(void*)                        __attribute__((__deprecated__));
- extern void *realloc(void*, size_t)            __malloc_like __attribute__((__deprecated__));
--#     elif defined(__APPLE__)
-+#     elif defined(__APPLE__) || defined(__sun)
- extern void *malloc(size_t)                    __attribute__((__deprecated__));
- extern void free(void*)                        __attribute__((__deprecated__));
- extern void *realloc(void*, size_t)            __attribute__((__deprecated__));
diff --git a/databases/mariadb105-client/patches/patch-storage_tokudb_PerconaFT_src_CMakeLists.txt b/databases/mariadb105-client/patches/patch-storage_tokudb_PerconaFT_src_CMakeLists.txt
deleted file mode 100644
index 4d29db9b85e..00000000000
--- a/databases/mariadb105-client/patches/patch-storage_tokudb_PerconaFT_src_CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-storage_tokudb_PerconaFT_src_CMakeLists.txt,v 1.1 2021/05/23 15:32:47 nia Exp $
-
-Portability.
-
---- storage/tokudb/PerconaFT/src/CMakeLists.txt.orig	2015-02-25 15:40:56.000000000 +0000
-+++ storage/tokudb/PerconaFT/src/CMakeLists.txt
-@@ -36,7 +36,9 @@ set_property(TARGET ${LIBTOKUDB} tokudb_
- configure_file(export.map . COPYONLY)
- if (NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
-   add_space_separated_property(TARGET ${LIBTOKUDB} COMPILE_FLAGS "-fvisibility=hidden -fvisibility-inlines-hidden")
-+  if (NOT CMAKE_SYSTEM_NAME STREQUAL SunOS)
-   add_space_separated_property(TARGET ${LIBTOKUDB} LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/export.map")
-+  endif ()
- endif ()
- 
- # detect when we are being built as a subproject