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,302 +1,302 @@
 PORTNAME?=	mariadb
-PORTVERSION=	11.4.3
+PORTVERSION=	11.4.4
 CATEGORIES=	databases
 MASTER_SITES=	https://mirror.nodesdirect.com/${SITESDIR}/ \
 		https://mirror.one.com/${SITESDIR}/ \
 		https://ftp.nluug.nl/db/${SITESDIR}/ \
 		https://ftp.icm.edu.pl/pub/unix/database/${SITESDIR}/ \
 		https://mirror.truenetwork.ru/${SITESDIR}/ \
 		https://mirrors.aliyun.com/${SITESDIR}/ \
 		https://ftp.ubuntu-tw.org/mirror/${SITESDIR}/ \
 		https://mirror.kku.ac.th/${SITESDIR}/ \
 		https://espejito.fder.edu.uy/${SITESDIR}/ \
 		https://ftp.osuosl.org/pub/${SITESDIR}/ \
 		https://downloads.mariadb.org/rest-api/mariadb/${PORTVERSION}/
 PKGNAMESUFFIX?=	114-server
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 WWW=		https://mariadb.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE?=	${WRKSRC}/COPYING
 
 #EXPIRATION_DATE=	2029-05-30
 
 LIB_DEPENDS+=	libfmt.so:devel/libfmt \
 		liblz4.so:archivers/liblz4 \
 		libpcre2-8.so:devel/pcre2 \
 		libzstd.so:archivers/zstd
 
 # Ugly workaround for MariaDB/CMake library detection
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 USES=		bison:build cmake:insource compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
 
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 USE_LDCONFIG=	${PREFIX}/lib/mysql
 SHEBANG_FILES?=	scripts/*.sh support-files/*.sh
 SITESDIR=	mariadb/mariadb-${PORTVERSION}/source
 DOCSDIR=	${PREFIX}/share/doc/mysql
 
 MARIADB_USER?=		mysql
 MARIADB_GROUP?=		mysql
 MARIADB_DBDIR?=		/var/db/mysql
 MARIADB_RUNDIR?=	/var/run/mysql
 MARIADB_SOCK?=		mysql.sock
 MARIADB_LOGDIR?=	/var/log/mysql
 
 USERS=			${MARIADB_USER}
 GROUPS=			${MARIADB_GROUP}
 
 OPTIONS_SINGLE=		GSSAPI
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 OPTIONS_DEFAULT=	GSSAPI_BASE
 
 .if ${PKGNAMESUFFIX:M*-server}
 # MySQL-Server options
 OPTIONS_DEFAULT+=	AWS_KEY_MGMT CONNECT_EXTRA HASHICORP_VAULT INNOBASE SPHINX SPIDER WSREP
 OPTIONS_GROUP=		COMPRESSION ENGINES GROONGA
 OPTIONS_DEFINE=		AWS_KEY_MGMT CONNECT_EXTRA DOCS HASHICORP_VAULT
 OPTIONS_DEFINE_amd64=	WSREP
 OPTIONS_DEFINE_aarch64=	WSREP
 OPTIONS_DEFINE_powerpc64le=	WSREP
 OPTIONS_DEFINE_powerpc64=	WSREP
 OPTIONS_DEFINE_riscv64=	WSREP
 OPTIONS_GROUP_COMPRESSION=	LZO SNAPPY
 OPTIONS_GROUP_ENGINES=	COLUMNSTORE INNOBASE MROONGA OQGRAPH ROCKSDB S3 SPHINX SPIDER
 OPTIONS_GROUP_GROONGA=	ZMQ MSGPACK
 OPTIONS_EXCLUDE_i386=	ROCKSDB
 OPTIONS_SUB=		yes
 
 AWS_KEY_MGMT_DESC=	AWS Encryption Key Management Plugin
 COLUMNSTORE_DESC=	Columnar storage egine
 CONNECT_EXTRA_DESC=	Enable ODBC and XML in CONNECT engine
 COMPRESSION_DESC=	Optional page compression
 ENGINES_DESC=	Optional MariaDB storage engines
 GROONGA_DESC=	Optional Mroonga features
 HASHICORP_VAULT_DESC=	Enable HashiCorp vault key-storage plugin
 INNOBASE_DESC=	InnoDB default engine
 MROONGA_DESC=	Mroonga Full Text Search engine
 MSGPACK_DESC=	MsgPack support
 OQGRAPH_DESC=	Open Query Graph Computation engine
 ROCKSDB_DESC=	RocksDB LSM engine
 S3_DESC=	S3 storage engine (Gamma)
 SPHINX_DESC=	SphinxSE engine
 SPIDER_DESC=	Partitioning and XA-transactions engine
 WSREP_DESC=	Build wsrep clustering
 ZMQ_DESC=	ZeroMQ support
 .endif
 
 CMAKE_ARGS+=	-DCMAKE_PREFIX_PATH=${PREFIX} \
 		-DINSTALL_DOCDIR="share/doc/mysql" \
 		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
 		-DINSTALL_INFODIR="info" \
 		-DINSTALL_LIBDIR="lib/mysql" \
 		-DINSTALL_MANDIR="share/man" \
 		-DINSTALL_MYSQLDATADIR="${MARIADB_DBDIR}" \
 		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
 		-DINSTALL_MYSQLTESTDIR= \
 		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
 		-DINSTALL_SBINDIR="libexec" \
 		-DINSTALL_SCRIPTDIR="bin" \
 		-DINSTALL_SQLBENCHDIR= \
 		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
 		-DINSTALL_SYSCONFDIR="${ETCDIR}" \
 		-DINSTALL_SYSCONF2DIR="${ETCDIR}/conf.d" \
 		-DINSTALL_UNIX_ADDRDIR="${MARIADB_RUNDIR}/${MARIADB_SOCK}" \
 		-DWITH_PCRE=system \
 		-DPCRE_LIBRARY_DIRS=${PREFIX}/lib \
 		-DWITH_LIBFMT=system \
 		-DLIBFMT_INCLUDE_DIR=${PREFIX}/include \
 		-DHAVE_SYSTEM_LIBFMT=yes \
 		-DWITH_SSL="${OPENSSLBASE}" \
 		-DGRN_WITH_LZ4=ON -DWITH_INNODB_LZ4=ON -DWITH_ROCKSDB_LZ4=ON \
 		-DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \
 		-DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \
 		-DCURSES_CURSES_LIBRARY="/usr/lib/libncurses.so" \
 		-DKRB5_CONFIG="${KRB5CONFIG}" \
 		-DCURSES_NCURSES_LIBRARY="${NCURSESLIB}/libncurses.so" \
 		-DCOMPILATION_COMMENT="FreeBSD Ports" \
 		-DPLUGIN_AUTH_TEST_PLUGIN=NO
 CMAKE_OFF+=	CONC_WITH_UNIT_TESTS CONNECT_WITH_MONGO WITH_UNIT_TESTS
 CMAKE_ON+=	WITH_LIBWRAP WITHOUT_DOCS
 DISABLED_PLUGINS+=	AUTH_TEST_PLUGIN DAEMON_EXAMPLE DIALOG_EXAMPLES \
 		EXAMPLE EXAMPLE_KEY_MANAGEMENT FTEXAMPLE
 
 DATADIR=	${PREFIX}/share/mysql
 ETCDIR=		${PREFIX}/etc/mysql
 
 CONFLICTS_INSTALL=	mariadb10[0-57-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
 			mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
 			mysqlwsrep* \
 			percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-*
 
 FASTMTX_CMAKE_BOOL=	WITH_FAST_MUTEXES
 GSSAPI_BASE_USES=	gssapi
 GSSAPI_HEIMDAL_USES=	gssapi:heimdal
 GSSAPI_MIT_USES=	gssapi:mit
 GSSAPI_NONE_CMAKE_ON=	-DPLUGIN_AUTH_GSSAPI_CLIENT=OFF
 OPTIONS_SUB=		yes
 SUB_LIST+=	MARIADB_RUNDIR="${MARIADB_RUNDIR}" \
 		MARIADB_SOCK="${MARIADB_SOCK}"
 
 .if ${PKGNAMESUFFIX:M*-connector-c}
 WRKSRC=		${WRKDIR}/mariadb-${PORTVERSION}/libmariadb
 
 .elif ${PKGNAMESUFFIX:M*-client}
 # MySQL-Client part
 CMAKE_ON+=	CONC_WITH_MYSQLCOMPAT WITHOUT_SERVER
 CMAKE_OFF+=	WITH_WSREP
 USES+=		readline
 USE_LDCONFIG=	${PREFIX}/lib/mysql
 SUB_FILES+=	my.cnf.sample client.cnf.sample
 
 .else # ! ${PKGNAMESUFFIX:M*-client}
 # MySQL-Server part
 USES+=		mysql:114m
 
 USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
 USE_RC_SUBR=	mysql-server
 
 CMAKE_ON+=	CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER
 CMAKE_OFF+=	WITH_CLIENT
 SUB_FILES+=	server.cnf.sample
 SUB_LIST+=	MARIADB_DBDIR="${MARIADB_DBDIR}" \
 		MARIADB_LOGDIR="${MARIADB_LOGDIR}" \
 		MARIADB_USER="${MARIADB_USER}"
 PLIST_SUB+=	MARIADB_LOGDIR="${MARIADB_LOGDIR}" \
 		MARIADB_USER="${MARIADB_USER}" \
 		MARIADB_GROUP="${MARIADB_GROUP}"
 
 .for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE}
 ${ENGINE}_CMAKE_OFF=	-DPLUGIN_${ENGINE}=NO
 ${ENGINE}_CMAKE_ON=	-DPLUGIN_${ENGINE}=DYNAMIC
 .endfor
 AWS_KEY_MGMT_CMAKE_ON=	-DPLUGIN_AWS_KEY_MANAGEMENT=ON
 INNOBASE_VARS_OFF=	disabled_plugins+=INNOBASE
 #COLUMNSTORE_BROKEN=	ColumnStore engine build failure "fatal error: 'sys/prctl.h' file not found"
 CONNECT_EXTRA_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 CONNECT_EXTRA_USE=		gnome=libxml2
 CONNECT_EXTRA_USES=		gnome
 CONNECT_EXTRA_CMAKE_BOOL=	CONNECT_WITH_LIBXML2 CONNECT_WITH_ODBC
 GSSAPI_NONE_VARS=	disabled_plugins+=AUTH_GSSAPI
 HASHICORP_VAULT_CMAKE_OFF=	-DPLUGIN_HASHICORP_KEY_MANAGEMENT=NO
 HASHICORP_VAULT_LIB_DEPENDS=	libcurl.so:ftp/curl
 LZO_CMAKE_ON=		-DWITH_INNODB_LZO=ON
 LZO_CMAKE_OFF=		-DWITH_INNODB_LZO=OFF
 LZO_LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 MSGPACK_LIB_DEPENDS=	libmsgpackc.so:devel/msgpack-c
 OQGRAPH_LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 			libJudy.so:devel/judy
 ROCKSDB_USES=		python
 ROCKSDB_CMAKE_ON=	-DPYTHON_SHEBANG=${PYTHON_CMD} -DWITH_ROCKSDB_zstd=ON
 S3_LIB_DEPENDS=		libcurl.so:ftp/curl
 SNAPPY_CMAKE_ON=	-DWITH_INNODB_SNAPPY=ON  -DWITH_ROCKSDB_snappy=ON
 SNAPPY_CMAKE_OFF=	-DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF
 SNAPPY_LIB_DEPENDS=	libsnappy.so:archivers/snappy
 WSREP_CMAKE_BOOL=	WITH_WSREP
 WSREP_LIB_DEPENDS=	libgalera.so:databases/galera26
 WSREP_RUN_DEPENDS=	bash:shells/bash \
 			rsync:net/rsync \
 			#stunnel:security/stunnel
 WSREP_SHEBANG_FILES=	bin/wsrep_sst_rsync
 ZMQ_LIB_DEPENDS=	libzmq.so:net/libzmq4
 
 .for PLUGIN in ${DISABLED_PLUGINS}
 CMAKE_ARGS+=		-DPLUGIN_${PLUGIN}=NO
 .endfor
 
 .endif # ${PKGNAMESUFFIX:M*-client}
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD
 SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
 .else
 SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
 .endif
 
 .if ${SSL_DEFAULT} != base && ${PORT_OPTIONS:MGSSAPI_BASE}
 GSSAPI_BASE_IGNORE=	GSSAPI_BASE is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
 .endif
 
 .if ${SSL_DEFAULT:Mlibressl*}
 CFLAGS+=	-Wno-incompatible-function-pointer-types
 .warning HELLO FROM MAKE LIBRESSL
 .endif
 
 .if ${ARCH} != amd64 && ${ARCH} != aarch64
 PLIST_SUB+=	WSREP="@comment "
 .endif
 
 post-patch:
 .if ${OPSYS} == DragonFly
 	${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \
 		${WRKSRC}/cmake/os/DragonFly.cmake
 .endif
 
 pre-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
 
 .if ${PKGNAMESUFFIX:M*-client}
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
 	${INSTALL_DATA} ${WRKDIR}/client.cnf.sample \
 		${STAGEDIR}${ETCDIR}/conf.d/client.cnf.sample
 	${RM} -r ${STAGEDIR}${DATADIR} \
 		${STAGEDIR}${PREFIX}/include/mysql/server \
 		${STAGEDIR}${ETCDIR}/init.d \
 		${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig
 
 post-install-GSSAPI_NONE-off:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so
 
 .else # ! ${PKGNAMESUFFIX:M*-client}
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/server.cnf.sample \
 		${STAGEDIR}${ETCDIR}/conf.d/server.cnf.sample
 	${MV} ${STAGEDIR}${PREFIX}/share/user_map.conf \
 		${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf.sample
 	${MV} ${STAGEDIR}${PREFIX}/share/pam_user_map.so \
 		${STAGEDIR}${PREFIX}/lib/mysql/
 	${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \
 		${STAGEDIR}${PREFIX}/include/mysql/server/private \
 		${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig \
 		${STAGEDIR}${PREFIX}/libexec/rcmysql \
 		${STAGEDIR}/suite \
 		${STAGEDIR}${ETCDIR}/init.d \
 		${STAGEDIR}${ETCDIR}/logrotate.d \
 		${STAGEDIR}${DOCSDIR}/COPYING
 	${MV} ${STAGEDIR}${ETCDIR}/conf.d/mysql-clients.cnf \
 		${STAGEDIR}${ETCDIR}/conf.d/mysql-clients.cnf.sample
 	${MKDIR} ${STAGEDIR}${MARIADB_LOGDIR}
 	${SED} '/%%/d;/^@comment /d;s/^/@comment /' ${PORTSDIR}/${CATEGORIES:[1]}/${PORTNAME}${PKGNAMESUFFIX:S/-server/-client/}/pkg-plist \
 		>> ${TMPPLIST}
 
 post-install-HASHICORP_VAULT-on:
 	${MV} ${STAGEDIR}${ETCDIR}/conf.d/hashicorp_key_management.cnf \
 		${STAGEDIR}${ETCDIR}/conf.d/hashicorp_key_management.cnf.sample
 
 post-install-MROONGA-on:
 	${MV} ${STAGEDIR}${PREFIX}/share/groonga/README.md ${STAGEDIR}${DOCSDIR}/README-groonga.md
 	${RM} -r ${STAGEDIR}${PREFIX}/share/groonga
 	${RM} ${STAGEDIR}${DATADIR}/mroonga/COPYING
 
 post-install-S3-on:
 	${MV} ${STAGEDIR}${ETCDIR}/conf.d/s3.cnf \
 		${STAGEDIR}${ETCDIR}/conf.d/s3.cnf.sample
 
 post-install-SPIDER-on:
 	${MV} ${STAGEDIR}${ETCDIR}/conf.d/spider.cnf \
 		${STAGEDIR}${ETCDIR}/conf.d/spider.cnf.sample
 
 post-install-WSREP-on:
 	${MV} ${STAGEDIR}${DATADIR}/wsrep.cnf \
 		${STAGEDIR}${ETCDIR}/conf.d/wsrep.cnf.sample
 
 .endif # ${PKGNAMESUFFIX:M*-client}
 
 .include <bsd.port.mk>
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"