From nobody Sun Nov 10 11:30:58 2024
X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
	by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XmVqQ2cJmz5cdKC;
	Sun, 10 Nov 2024 11:30:58 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
	 client-signature RSA-PSS (4096 bits) client-digest SHA256)
	(Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK))
	by mx1.freebsd.org (Postfix) with ESMTPS id 4XmVqQ2KHRz4hsY;
	Sun, 10 Nov 2024 11:30:58 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1731238258;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding;
	bh=fD1GF2TIz471PSWP9DnulSKNhO6mS8KzP/SfkbBfbhw=;
	b=j0IhSNus4Ol9EkyaSnlpaB6h1+F7jVQ3xsMzOWo74MlgC1c71B/Nl5UoKNUDftE2i4Fjaz
	H70wCEuEM13as/JTlsa8b6g82BDJehrt9FyG2fUaSyhUsnLFnjSSCDZZFtWjoWFVGIbPQk
	Pg2FfjzqKtR9zM1kZrnkaaJKTf2qf1YU8wnRX8LJvQ4H46gKvdB9GAE2Ac/4UyG6LO+D7v
	bCwN3r3a4oyCrs/H0xYlY228VEJg59cBrc1XWefzgEJ7YaPn4g9+xQZSn6KThHz7cvZg5u
	thNBGsGr7kK5XaZv3v2Z0qOKLjyIILS9zJi9EdZvakcZHGqdyK0uswlPNW5pSw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1731238258;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding;
	bh=fD1GF2TIz471PSWP9DnulSKNhO6mS8KzP/SfkbBfbhw=;
	b=iIFBd5x2jhZzKA2V9b+QakmHiVbznFsesy0rwl2YRm44idACHcyNWslu2dNwivauXZ1e7c
	2r8ufOhWXauPY/ch6/GuGxDq9Pcix9wW5Dd1dx+CvWJklow3ipUjX4qbnqZqAPjcFrMnsJ
	ndS5JJrakciiItFZhrx/+AaFfggf1rFlqN4o7vcyhNCGoFXD0sB7zw60vFIY18OPl2H2/8
	/LuvJSdGbSo42VG/m6Mj8JAngz5lOOpCG6VFJKEdEOqqTc2vx1j7tE8C7bm1FsCAKE0dMl
	YQMm1x0mZp2Kr60pHd/dFq7NvnKC0u0Jn8in5OozJHa8XMtpkPuZTsKUPtYBjw==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731238258; a=rsa-sha256; cv=none;
	b=ynwaG3Sb5UE+BBI2PSiUEo7GkJaQOd50Aku311GhM4S8V1hmg/cXp88NTfkafkm43lGixD
	CPFNCri4m4nvU+h3Dw2O4XRPgP3aZt/0axxs0KOAU5rxn7+cUy4fbkfI0BHboCEPLZS8bI
	BelnkEI7ymDaw16AJRplvTjdf4ZR6sS3O4izYBwfJJ8nY0P5gOoG4h7d+TxCG8VBX6Arkj
	N5hCt2+QlByueIGpmG5ktUvrWeiArVrXxJsDwwuddWGMhOnaxPy5ij0A8DNrJ2G9Zhsf9d
	BvZ6Chia/L4EP37XXEKWF1NQsEtJwTJZswQKJJykbH/IYQjffydCUOYk31Zf0Q==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(Client did not present a certificate)
	by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XmVqQ1wMKzgg1;
	Sun, 10 Nov 2024 11:30:58 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
	by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AABUwkT031891;
	Sun, 10 Nov 2024 11:30:58 GMT
	(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
	by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AABUwWc031888;
	Sun, 10 Nov 2024 11:30:58 GMT
	(envelope-from git)
Date: Sun, 10 Nov 2024 11:30:58 GMT
Message-Id: <202411101130.4AABUwWc031888@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
        dev-commits-ports-main@FreeBSD.org
From: Bernard Spil <brnrd@FreeBSD.org>
Subject: git: 4019209926c6 - main - databases/mariadb114-server:
  Update to 11.4.4
List-Id: Commit messages for all branches of the ports repository <dev-commits-ports-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all
List-Help: <mailto:dev-commits-ports-all+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-all+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-ports-all@freebsd.org
Sender: owner-dev-commits-ports-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: brnrd
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 4019209926c6d41c54503fc5db071481964dbe51
Auto-Submitted: auto-generated

The branch main has been updated by brnrd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4019209926c6d41c54503fc5db071481964dbe51

commit 4019209926c6d41c54503fc5db071481964dbe51
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2024-11-10 11:30:54 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2024-11-10 11:30:54 +0000

    databases/mariadb114-server: Update to 11.4.4
---
 databases/mariadb114-server/Makefile               |   2 +-
 databases/mariadb114-server/distinfo               |   6 +-
 .../files/patch-include_my__cpu.h                  |  48 --
 .../files/patch-mysys_crc32_crc32c.cc              |  11 -
 .../mariadb114-server/files/patch-sql_mysqld.cc    |  20 -
 .../patch-storage_columnstore-tr1                  | 689 +++++++++++++++++++++
 6 files changed, 693 insertions(+), 83 deletions(-)

diff --git a/databases/mariadb114-server/Makefile b/databases/mariadb114-server/Makefile
index 6dd349bc9cf2..a050630bafe8 100644
--- a/databases/mariadb114-server/Makefile
+++ b/databases/mariadb114-server/Makefile
@@ -1,5 +1,5 @@
 PORTNAME?=	mariadb
-PORTVERSION=	11.4.3
+PORTVERSION=	11.4.4
 CATEGORIES=	databases
 MASTER_SITES=	https://mirror.nodesdirect.com/${SITESDIR}/ \
 		https://mirror.one.com/${SITESDIR}/ \
diff --git a/databases/mariadb114-server/distinfo b/databases/mariadb114-server/distinfo
index 7cf506b1f49a..8efd0268c31e 100644
--- a/databases/mariadb114-server/distinfo
+++ b/databases/mariadb114-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1723390111
-SHA256 (mariadb-11.4.3.tar.gz) = 6f0017b9901bb1897de0eed21caef9ffa9d66ef559345a0d8a6f011308413ece
-SIZE (mariadb-11.4.3.tar.gz) = 108166685
+TIMESTAMP = 1731170702
+SHA256 (mariadb-11.4.4.tar.gz) = 96fbd2e6e93fb7e8b373eea75d85b6fea57c0e111a02090cbbefed52599dc77b
+SIZE (mariadb-11.4.4.tar.gz) = 111017581
diff --git a/databases/mariadb114-server/files/patch-include_my__cpu.h b/databases/mariadb114-server/files/patch-include_my__cpu.h
deleted file mode 100644
index 3dd96615bdb9..000000000000
--- a/databases/mariadb114-server/files/patch-include_my__cpu.h
+++ /dev/null
@@ -1,48 +0,0 @@
---- include/my_cpu.h.orig	2024-05-26 18:15:37 UTC
-+++ include/my_cpu.h
-@@ -23,7 +23,8 @@
-   The defines are the same ones used by the linux kernel
- */
- 
--#ifdef _ARCH_PWR8
-+#if defined(_ARCH_PWR8)
-+#if defined(linux)
- #include <sys/platform/ppc.h>
- /* Very low priority */
- #define HMT_very_low() __ppc_set_ppr_very_low()
-@@ -37,6 +38,22 @@
- #define HMT_medium_high() __ppc_set_ppr_med_high()
- /* High priority */
- #define HMT_high() asm volatile("or 3,3,3")
-+#elif defined(__FreeBSD__)
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+/* Very low priority */
-+#define HMT_very_low() __asm__ volatile ("or 31,31,31")
-+/* Low priority */
-+#define HMT_low() __asm__ volatile ("or 1,1,1")
-+/* Medium low priority */
-+#define HMT_medium_low() __asm__ volatile ("or 6,6,6")
-+/* Medium priority */
-+#define HMT_medium() __asm__ volatile ("or 2,2,2")
-+/* Medium high priority */
-+#define HMT_medium_high() __asm__ volatile ("or 5,5,5")
-+/* High priority */
-+#define HMT_high() asm volatile("or 3,3,3")
-+#endif
- #else
- #define HMT_very_low()
- #define HMT_low()
-@@ -81,7 +98,12 @@ static inline void MY_RELAX_CPU(void)
-   __asm__ __volatile__ ("pause");
- #endif
- #elif defined(_ARCH_PWR8)
-+#if defined(linux)
-   __ppc_get_timebase();
-+#elif defined(__FreeBSD__)
-+  uint64_t __tb;
-+  __asm__ volatile ("mfspr %0, 268" : "=r" (__tb));
-+#endif
- #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
-   /* Mainly, prevent the compiler from optimizing away delay loops */
-   __asm__ __volatile__ ("":::"memory");
diff --git a/databases/mariadb114-server/files/patch-mysys_crc32_crc32c.cc b/databases/mariadb114-server/files/patch-mysys_crc32_crc32c.cc
deleted file mode 100644
index 86261dbdc160..000000000000
--- a/databases/mariadb114-server/files/patch-mysys_crc32_crc32c.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- mysys/crc32/crc32c.cc.orig	2024-06-14 12:14:03 UTC
-+++ mysys/crc32/crc32c.cc
-@@ -455,7 +455,7 @@ static int arch_ppc_probe(void) {
- 
-   return arch_ppc_crc32;
- }
--# elif defined __FreeBSD_version && __FreeBSD_version >= 1200000
-+# elif defined __FreeBSD__
- #  include <machine/cpu.h>
- #  include <sys/auxv.h>
- #  include <sys/elf_common.h>
diff --git a/databases/mariadb114-server/files/patch-sql_mysqld.cc b/databases/mariadb114-server/files/patch-sql_mysqld.cc
deleted file mode 100644
index 3d49943a974f..000000000000
--- a/databases/mariadb114-server/files/patch-sql_mysqld.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- sql/mysqld.cc.orig	2024-05-26 18:15:38 UTC
-+++ sql/mysqld.cc
-@@ -209,7 +209,7 @@ inline void setup_fpu()
- 
- inline void setup_fpu()
- {
--#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT)
-+#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) && defined(FP_X_INV)
-   /* We can't handle floating point exceptions with threads, so disable
-      this on freebsd
-      Don't fall for overflow, underflow,divide-by-zero or loss of precision.
-@@ -222,7 +222,7 @@ inline void setup_fpu()
-   fpsetmask(~(FP_X_INV |             FP_X_OFL | FP_X_UFL | FP_X_DZ |
-               FP_X_IMP));
- #endif /* FP_X_DNML */
--#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT */
-+#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT && FP_X_INV */
- 
- #ifdef HAVE_FEDISABLEEXCEPT
-   fedisableexcept(FE_ALL_EXCEPT);
diff --git a/databases/mariadb114-server/patch-storage_columnstore-tr1 b/databases/mariadb114-server/patch-storage_columnstore-tr1
new file mode 100644
index 000000000000..863acf8fe0c5
--- /dev/null
+++ b/databases/mariadb114-server/patch-storage_columnstore-tr1
@@ -0,0 +1,689 @@
+--- storage/columnstore/columnstore/datatypes/mcs_datatype.cpp.orig	2024-05-26 18:15:40 UTC
++++ storage/columnstore/columnstore/datatypes/mcs_datatype.cpp
+@@ -19,12 +19,12 @@
+ #include <string>
+ #include <iostream>
+ #include <stack>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ #include <fstream>
+ #include <sstream>
+ #include <cerrno>
+ #include <cstring>
+-#include <tr1/unordered_set>
++#include <unordered_set>
+ #include <utility>
+ #include <cassert>
+ using namespace std;
+--- storage/columnstore/columnstore/dbcon/joblist/largehashjoin.h.orig	2024-05-26 18:15:40 UTC
++++ storage/columnstore/columnstore/dbcon/joblist/largehashjoin.h
+@@ -32,7 +32,7 @@
+ #include <sstream>
+ #include <vector>
+ #include <list>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ 
+ #include <boost/thread.hpp>
+ #include <boost/scoped_array.hpp>
+--- storage/columnstore/columnstore/dbcon/joblist/lbidlist.h.orig	2024-05-26 18:15:40 UTC
++++ storage/columnstore/columnstore/dbcon/joblist/lbidlist.h
+@@ -31,7 +31,7 @@
+ #include "bytestream.h"
+ #include <iostream>
+ #include "brm.h"
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ 
+ namespace joblist
+ {
+--- storage/columnstore/columnstore/dbcon/joblist/primitivestep.h.orig	2024-05-26 18:15:40 UTC
++++ storage/columnstore/columnstore/dbcon/joblist/primitivestep.h
+@@ -33,7 +33,7 @@
+ #include <map>
+ #include <stdexcept>
+ #include <sstream>
+-#include <tr1/memory>
++#include <memory>
+ 
+ #include <boost/shared_ptr.hpp>
+ 
+--- storage/columnstore/columnstore/dbcon/joblist/tupleannexstep.cpp.orig	2024-05-26 18:15:40 UTC
++++ storage/columnstore/columnstore/dbcon/joblist/tupleannexstep.cpp
+@@ -22,7 +22,7 @@
+ #include <cassert>
+ #include <sstream>
+ #include <iomanip>
+-#include <tr1/unordered_set>
++#include <unordered_set>
+ using namespace std;
+ 
+ #include <boost/shared_ptr.hpp>
+--- storage/columnstore/columnstore/dbcon/joblist/tupleunion.h.orig	2024-05-26 18:15:40 UTC
++++ storage/columnstore/columnstore/dbcon/joblist/tupleunion.h
+@@ -28,7 +28,7 @@
+ //
+ 
+ #include "jobstep.h"
+-#include <tr1/unordered_set>
++#include <unordered_set>
+ 
+ #include "stlpoolallocator.h"
+ #include "threadnaming.h"
+--- storage/columnstore/columnstore/dbcon/mysql/ha_mcs_ddl.cpp.orig	2024-05-26 18:15:40 UTC
++++ storage/columnstore/columnstore/dbcon/mysql/ha_mcs_ddl.cpp
+@@ -25,13 +25,13 @@
+ #include <string>
+ #include <iostream>
+ #include <stack>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ #include <fstream>
+ #include <sstream>
+ #include <cerrno>
+ #include <cstring>
+ #include <regex>
+-#include <tr1/unordered_set>
++#include <unordered_set>
+ #include <utility>
+ #include <cassert>
+ using namespace std;
+--- storage/columnstore/columnstore/dbcon/mysql/ha_mcs_dml.cpp.orig	2024-05-26 18:15:40 UTC
++++ storage/columnstore/columnstore/dbcon/mysql/ha_mcs_dml.cpp
+@@ -25,8 +25,8 @@
+ #include <string>
+ #include <iostream>
+ #include <stack>
+-#include <tr1/unordered_map>
+-#include <tr1/unordered_set>
++#include <unordered_map>
++#include <unordered_set>
+ #include <fstream>
+ #include <sstream>
+ #include <cerrno>
+--- storage/columnstore/columnstore/dbcon/mysql/ha_mcs_execplan.cpp.orig	2024-05-26 18:15:40 UTC
++++ storage/columnstore/columnstore/dbcon/mysql/ha_mcs_execplan.cpp
+@@ -21,8 +21,8 @@
+ #include <string>
+ #include <iostream>
+ #include <stack>
+-#include <tr1/unordered_map>
+-#include <tr1/unordered_set>
++#include <unordered_map>
++#include <unordered_set>
+ #include <fstream>
+ #include <sstream>
+ #include <cerrno>
+--- storage/columnstore/columnstore/dbcon/mysql/ha_mcs_impl.cpp.orig	2024-05-26 18:15:40 UTC
++++ storage/columnstore/columnstore/dbcon/mysql/ha_mcs_impl.cpp
+@@ -22,8 +22,8 @@
+ #include <string>
+ #include <iostream>
+ #include <stack>
+-#include <tr1/unordered_map>
+-#include <tr1/unordered_set>
++#include <unordered_map>
++#include <unordered_set>
+ #include <fstream>
+ #include <sstream>
+ #include <cerrno>
+--- storage/columnstore/columnstore/dbcon/mysql/ha_mcs_impl_if.h.orig	2024-05-26 18:15:40 UTC
++++ storage/columnstore/columnstore/dbcon/mysql/ha_mcs_impl_if.h
+@@ -21,7 +21,7 @@
+ #include <bitset>
+ #include <string>
+ #include <stdint.h>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ #include <iosfwd>
+ #include <boost/shared_ptr.hpp>
+ #include <stack>
+--- storage/columnstore/columnstore/dbcon/mysql/ha_mcs_udf.cpp.orig	2024-05-26 18:15:40 UTC
++++ storage/columnstore/columnstore/dbcon/mysql/ha_mcs_udf.cpp
+@@ -21,7 +21,7 @@
+  */
+ 
+ #include <my_config.h>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ using namespace std;
+ 
+ #include "idb_mysql.h"
+--- storage/columnstore/columnstore/primitives/blockcache/filebuffermgr.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/primitives/blockcache/filebuffermgr.h
+@@ -26,7 +26,7 @@
+ #include <iostream>
+ #include <fstream>
+ #include <iomanip>
+-#include <tr1/unordered_set>
++#include <unordered_set>
+ #include <boost/thread.hpp>
+ #include <deque>
+ 
+--- storage/columnstore/columnstore/primitives/blockcache/iomanager.cpp.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/primitives/blockcache/iomanager.cpp
+@@ -48,8 +48,8 @@
+ #include <stdlib.h>
+ #include <string>
+ #include <sstream>
+-#include <tr1/unordered_map>
+-#include <tr1/unordered_set>
++#include <unordered_map>
++#include <unordered_set>
+ #include <set>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+--- storage/columnstore/columnstore/primitives/linux-port/primitiveprocessor.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/primitives/linux-port/primitiveprocessor.h
+@@ -27,7 +27,7 @@
+ 
+ #include <stdexcept>
+ #include <vector>
+-#include <tr1/unordered_set>
++#include <unordered_set>
+ 
+ #define POSIX_REGEX
+ 
+--- storage/columnstore/columnstore/primitives/primproc/batchprimitiveprocessor.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/primitives/primproc/batchprimitiveprocessor.h
+@@ -33,7 +33,7 @@
+ #include <boost/scoped_array.hpp>
+ #include <boost/shared_ptr.hpp>
+ #include <boost/scoped_ptr.hpp>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ #include <boost/thread.hpp>
+ 
+ #include "errorcodes.h"
+--- storage/columnstore/columnstore/primitives/primproc/bppseeder.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/primitives/primproc/bppseeder.h
+@@ -34,7 +34,7 @@
+ #include <iostream>
+ #include <iomanip>
+ #include <unistd.h>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ #include <boost/shared_ptr.hpp>
+ 
+ #include "batchprimitiveprocessor.h"
+--- storage/columnstore/columnstore/primitives/primproc/primitiveserver.cpp.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/primitives/primproc/primitiveserver.cpp
+@@ -36,8 +36,8 @@
+ #include <boost/thread.hpp>
+ #include <boost/thread/condition.hpp>
+ #include <boost/foreach.hpp>
+-#include <tr1/unordered_map>
+-#include <tr1/unordered_set>
++#include <unordered_map>
++#include <unordered_set>
+ #include <pthread.h>
+ #include <cerrno>
+ 
+--- storage/columnstore/columnstore/primitives/primproc/primitiveserver.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/primitives/primproc/primitiveserver.h
+@@ -25,8 +25,8 @@
+ #pragma once
+ 
+ #include <map>
+-#include <tr1/unordered_map>
+-#include <tr1/unordered_set>
++#include <unordered_map>
++#include <unordered_set>
+ #include <unordered_map>
+ #include <boost/thread.hpp>
+ 
+--- storage/columnstore/columnstore/primitives/primproc/primproc.cpp.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/primitives/primproc/primproc.cpp
+@@ -31,7 +31,7 @@
+ #include <csignal>
+ #include <sys/time.h>
+ #include <sys/resource.h>
+-#include <tr1/unordered_set>
++#include <unordered_set>
+ 
+ #include <clocale>
+ #include <iterator>
+--- storage/columnstore/columnstore/storage-manager/src/SessionManager.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/storage-manager/src/SessionManager.h
+@@ -23,7 +23,7 @@
+ #include <signal.h>
+ #include <boost/thread/mutex.hpp>
+ #include <sys/poll.h>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ 
+ namespace storagemanager
+ {
+--- storage/columnstore/columnstore/utils/common/threadnaming.cpp.orig	2022-05-18 08:34:17 UTC
++++ storage/columnstore/columnstore/utils/common/threadnaming.cpp
+@@ -22,13 +22,21 @@ namespace utils
+ {
+ void setThreadName(const char* threadName)
+ {
++#ifdef __FreeBSD__
++  pthread_set_name_np(pthread_self(), threadName);
++#else
+   prctl(PR_SET_NAME, threadName, 0, 0, 0);
++#endif
+ }
+ 
+ std::string getThreadName()
+ {
+   char buf[32];
++#ifdef __FreeBSD__
++  pthread_get_name_np(pthread_self(), buf, sizeof(buf));
++#else
+   prctl(PR_GET_NAME, buf, 0, 0, 0);
++#endif
+   return std::string(buf);
+ }
+ }  // namespace utils
+--- storage/columnstore/columnstore/utils/configcpp/configcpp.cpp.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/configcpp/configcpp.cpp
+@@ -57,7 +57,7 @@ namespace fs = boost::filesystem;
+ 
+ #include "exceptclasses.h"
+ #include "installdir.h"
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ 
+ #include "bytestream.h"
+ 
+--- storage/columnstore/columnstore/utils/configcpp/writeonce.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/configcpp/writeonce.h
+@@ -25,7 +25,7 @@
+ #pragma once
+ 
+ #include <string>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ 
+ #include <stddef.h>
+ 
+--- storage/columnstore/columnstore/utils/funcexp/funcexp.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/funcexp/funcexp.h
+@@ -26,7 +26,7 @@
+ 
+ #include <string>
+ #include <vector>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ #include <boost/thread/mutex.hpp>
+ 
+ #include "rowgroup.h"
+--- storage/columnstore/columnstore/utils/joiner/joiner.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/joiner/joiner.h
+@@ -21,7 +21,7 @@
+ #include <vector>
+ #include <boost/shared_ptr.hpp>
+ 
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ 
+ #include "../common/simpleallocator.h"
+ #include "../joblist/elementtype.h"
+--- storage/columnstore/columnstore/utils/joiner/tuplejoiner.cpp.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/joiner/tuplejoiner.cpp
+@@ -20,7 +20,7 @@
+ #include <algorithm>
+ #include <vector>
+ #include <limits>
+-#include <tr1/unordered_set>
++#include <unordered_set>
+ 
+ #include "hasher.h"
+ #include "lbidlist.h"
+--- storage/columnstore/columnstore/utils/joiner/tuplejoiner.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/joiner/tuplejoiner.h
+@@ -24,7 +24,7 @@
+ #include <boost/scoped_ptr.hpp>
+ 
+ #include <boost/scoped_array.hpp>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ 
+ #include "rowgroup.h"
+ #include "joiner.h"
+--- storage/columnstore/columnstore/utils/regr/corr.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/regr/corr.h
+@@ -33,7 +33,7 @@
+ #include <cstdlib>
+ #include <string>
+ #include <vector>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ 
+ #include "mcsv1_udaf.h"
+ #include "calpontsystemcatalog.h"
+--- storage/columnstore/columnstore/utils/regr/covar_pop.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/regr/covar_pop.h
+@@ -33,7 +33,7 @@
+ #include <cstdlib>
+ #include <string>
+ #include <vector>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ 
+ #include "mcsv1_udaf.h"
+ #include "calpontsystemcatalog.h"
+--- storage/columnstore/columnstore/utils/regr/covar_samp.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/regr/covar_samp.h
+@@ -33,7 +33,7 @@
+ #include <cstdlib>
+ #include <string>
+ #include <vector>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ 
+ #include "mcsv1_udaf.h"
+ #include "calpontsystemcatalog.h"
+--- storage/columnstore/columnstore/utils/regr/regr_avgx.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/regr/regr_avgx.h
+@@ -33,7 +33,7 @@
+ #include <cstdlib>
+ #include <string>
+ #include <vector>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ 
+ #include "mcsv1_udaf.h"
+ #include "calpontsystemcatalog.h"
+--- storage/columnstore/columnstore/utils/regr/regr_avgy.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/regr/regr_avgy.h
+@@ -33,7 +33,7 @@
+ #include <cstdlib>
+ #include <string>
+ #include <vector>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ 
+ #include "mcsv1_udaf.h"
+ #include "calpontsystemcatalog.h"
+--- storage/columnstore/columnstore/utils/regr/regr_count.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/regr/regr_count.h
+@@ -33,7 +33,7 @@
+ #include <cstdlib>
+ #include <string>
+ #include <vector>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ 
+ #include "mcsv1_udaf.h"
+ #include "calpontsystemcatalog.h"
+--- storage/columnstore/columnstore/utils/regr/regr_intercept.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/regr/regr_intercept.h
+@@ -33,7 +33,7 @@
+ #include <cstdlib>
+ #include <string>
+ #include <vector>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ 
+ #include "mcsv1_udaf.h"
+ #include "calpontsystemcatalog.h"
+--- storage/columnstore/columnstore/utils/regr/regr_r2.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/regr/regr_r2.h
+@@ -33,7 +33,7 @@
+ #include <cstdlib>
+ #include <string>
+ #include <vector>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ 
+ #include "mcsv1_udaf.h"
+ #include "calpontsystemcatalog.h"
+--- storage/columnstore/columnstore/utils/regr/regr_slope.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/regr/regr_slope.h
+@@ -33,7 +33,7 @@
+ #include <cstdlib>
+ #include <string>
+ #include <vector>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ 
+ #include "mcsv1_udaf.h"
+ #include "calpontsystemcatalog.h"
+--- storage/columnstore/columnstore/utils/regr/regr_sxx.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/regr/regr_sxx.h
+@@ -33,7 +33,7 @@
+ #include <cstdlib>
+ #include <string>
+ #include <vector>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ 
+ #include "mcsv1_udaf.h"
+ #include "calpontsystemcatalog.h"
+--- storage/columnstore/columnstore/utils/regr/regr_sxy.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/regr/regr_sxy.h
+@@ -33,7 +33,7 @@
+ #include <cstdlib>
+ #include <string>
+ #include <vector>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ 
+ #include "mcsv1_udaf.h"
+ #include "calpontsystemcatalog.h"
+--- storage/columnstore/columnstore/utils/regr/regr_syy.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/regr/regr_syy.h
+@@ -33,7 +33,7 @@
+ #include <cstdlib>
+ #include <string>
+ #include <vector>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ 
+ #include "mcsv1_udaf.h"
+ #include "calpontsystemcatalog.h"
+--- storage/columnstore/columnstore/utils/rowgroup/rowaggregation.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/rowgroup/rowaggregation.h
+@@ -32,8 +32,8 @@
+ #include <cstdint>
+ #include <utility>
+ #include <vector>
+-#include <tr1/unordered_map>
+-#include <tr1/unordered_set>
++#include <unordered_map>
++#include <unordered_set>
+ #include <boost/shared_ptr.hpp>
+ 
+ #include <boost/scoped_array.hpp>
+--- storage/columnstore/columnstore/utils/rwlock/rwlock.cpp.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/rwlock/rwlock.cpp
+@@ -26,7 +26,7 @@
+ #include <string>
+ #include <sstream>
+ #include <iomanip>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ 
+ #ifndef NDEBUG
+ #define NDEBUG
+--- storage/columnstore/columnstore/utils/testbc/filebuffermgr.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/testbc/filebuffermgr.h
+@@ -27,7 +27,7 @@
+ #include "blocksize.h"
+ #include "filebuffer.h"
+ #include "rwlock_local.h"
+-#include <tr1/unordered_set>
++#include <unordered_set>
+ #include <boost/thread.hpp>
+ 
+ /**
+--- storage/columnstore/columnstore/utils/udfsdk/allnull.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/udfsdk/allnull.h
+@@ -47,7 +47,7 @@
+ #include <cstdlib>
+ #include <string>
+ #include <vector>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ 
+ #include "mcsv1_udaf.h"
+ #include "calpontsystemcatalog.h"
+--- storage/columnstore/columnstore/utils/udfsdk/avg_mode.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/udfsdk/avg_mode.h
+@@ -55,7 +55,7 @@
+ #include <cstdlib>
+ #include <string>
+ #include <vector>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ 
+ #include "mcsv1_udaf.h"
+ #include "calpontsystemcatalog.h"
+--- storage/columnstore/columnstore/utils/udfsdk/avgx.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/udfsdk/avgx.h
+@@ -34,7 +34,7 @@
+ #include <cstdlib>
+ #include <string>
+ #include <vector>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ 
+ #include "mcsv1_udaf.h"
+ #include "calpontsystemcatalog.h"
+--- storage/columnstore/columnstore/utils/udfsdk/mcsv1_udaf.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/udfsdk/mcsv1_udaf.h
+@@ -67,7 +67,7 @@
+ #include <vector>
+ #include <map>
+ #include <boost/shared_ptr.hpp>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ #include "any.hpp"
+ #include "calpontsystemcatalog.h"
+ #include "wf_frame.h"
+--- storage/columnstore/columnstore/utils/udfsdk/median.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/udfsdk/median.h
+@@ -55,7 +55,7 @@
+ #include <cstdlib>
+ #include <string>
+ #include <vector>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ 
+ #include "mcsv1_udaf.h"
+ #include "calpontsystemcatalog.h"
+--- storage/columnstore/columnstore/utils/udfsdk/ssq.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/udfsdk/ssq.h
+@@ -55,7 +55,7 @@
+ #include <cstdlib>
+ #include <string>
+ #include <vector>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ 
+ #include "mcsv1_udaf.h"
+ #include "calpontsystemcatalog.h"
+--- storage/columnstore/columnstore/utils/windowfunction/idborderby.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/windowfunction/idborderby.h
+@@ -29,7 +29,7 @@
+ 
+ #include <boost/scoped_ptr.hpp>
+ 
+-#include <tr1/unordered_set>
++#include <unordered_set>
+ 
+ #include "rowgroup.h"
+ #include "hasher.h"
+--- storage/columnstore/columnstore/utils/windowfunction/wf_udaf.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/utils/windowfunction/wf_udaf.h
+@@ -19,7 +19,7 @@
+ 
+ #pragma once
+ 
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ #include "windowfunctiontype.h"
+ #include "mcsv1_udaf.h"
+ 
+--- storage/columnstore/columnstore/versioning/BRM/brmtypes.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/versioning/BRM/brmtypes.h
+@@ -33,7 +33,7 @@
+ #include "mcs_basic_types.h"
+ #include "logicalpartition.h"
+ 
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ #ifndef _UNORDERED_MAP_FIX_
+ #define _UNORDERED_MAP_FIX_
+ #endif  //_UNORDERED_MAP_FIX_
+--- storage/columnstore/columnstore/versioning/BRM/extentmap.cpp.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/versioning/BRM/extentmap.cpp
+@@ -38,7 +38,7 @@
+ #include <boost/scoped_array.hpp>
+ #include <boost/scoped_ptr.hpp>
+ #include <boost/thread.hpp>
+-#include <tr1/unordered_set>
++#include <unordered_set>
+ 
+ #include <boost/interprocess/shared_memory_object.hpp>
+ #include <boost/interprocess/mapped_region.hpp>
+--- storage/columnstore/columnstore/versioning/BRM/extentmap.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/versioning/BRM/extentmap.h
+@@ -31,7 +31,7 @@
+ #include <vector>
+ #include <set>
+ #include <unordered_map>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ #include <mutex>
+ 
+ // #define NDEBUG
+--- storage/columnstore/columnstore/versioning/BRM/lbidresourcegraph.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/versioning/BRM/lbidresourcegraph.h
+@@ -28,7 +28,7 @@
+ 
+ #include <map>
+ #include <set>
+-#include <tr1/unordered_set>
++#include <unordered_set>
+ #include <boost/thread.hpp>
+ 
+ #include "brmtypes.h"
+--- storage/columnstore/columnstore/writeengine/bulk/we_colextinf.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/writeengine/bulk/we_colextinf.h
+@@ -30,7 +30,7 @@
+ #include <limits>
+ #include <stdint.h>
+ #include <set>
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ #include <boost/thread/mutex.hpp>
+ 
+ #include "brmtypes.h"
+--- storage/columnstore/columnstore/writeengine/bulk/we_extentstripealloc.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/writeengine/bulk/we_extentstripealloc.h
+@@ -29,7 +29,7 @@
+ #include <string>
+ #include <vector>
+ 
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ #include <boost/thread/mutex.hpp>
+ 
+ #include "we_type.h"
+--- storage/columnstore/columnstore/writeengine/shared/we_cache.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/writeengine/shared/we_cache.h
+@@ -26,7 +26,7 @@
+ #if __GNUC__ == 4 && __GNUC_MINOR__ < 2
+ #include <ext/hash_map>
+ #else
+-#include <tr1/unordered_map>
++#include <unordered_map>
+ #endif
+ #include <map>
+ 
+--- storage/columnstore/columnstore/writeengine/wrapper/writeengine.h.orig	2024-05-26 18:15:41 UTC
++++ storage/columnstore/columnstore/writeengine/wrapper/writeengine.h
+@@ -29,7 +29,7 @@
+ #include <fcntl.h>
+ // end
+ #include <boost/lexical_cast.hpp>
+-#include <tr1/unordered_set>
++#include <unordered_set>
+ 
+ #include "we_brm.h"
+ #include "we_colop.h"