Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main

1 files changed, 15 insertions, 0 deletions

diff --git a/databases/mysql94-server/files/patch-include_my__thread__os__id.h b/databases/mysql94-server/files/patch-include_my__thread__os__id.h
new file mode 100644
index 000000000000..086e04f85457
--- /dev/null
+++ b/databases/mysql94-server/files/patch-include_my__thread__os__id.h
@@ -0,0 +1,15 @@
+--- include/my_thread_os_id.h.orig	2024-04-10 06:26:28 UTC
++++ include/my_thread_os_id.h
+@@ -85,8 +85,12 @@ static inline my_thread_os_id_t my_thread_os_id() {
+   return pthread_getthreadid_np();
+ #else
+ #ifdef HAVE_INTEGER_PTHREAD_SELF
++#  ifdef __DragonFly__
++  return syscall(SYS_lwp_gettid);
++#  else
+   /* Unknown platform, fallback. */
+   return pthread_self();
++#  endif
+ #else
+   /* Feature not available. */
+   return 0;