From nobody Sun Aug 18 12:40:17 2024 X-Original-To: dev-commits-ports-main@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 4WmwLB0zCYz5T3jy; Sun, 18 Aug 2024 12:40:18 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WmwLB0fvdz4VLc; Sun, 18 Aug 2024 12:40:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723984818; 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=Yt+vPLYdHgInbkA6BNG7XZn4fWOyy1da43FQkrCPcyA=; b=gfn6NzbrIvVsjpwmMqGJgEWYdq+wSxIdy2eCukj3ROfDn0bOs9DaTB4sCo7O9xCVLPHWzh yeVn0MBfZIAGyTux8t7TYeY7JK3uNqg2xP7gakx7I+XlbdIp4pcNl3S6uMdrzLie2C+1YQ ufkb1fTTiJDLf8aGj9n6tA7SPE3MCZh5VzFBYCcnHYVyd79/duTaPG+zZsO3RAK/oD50NO /0gcJ0NmNUXFdMJDZQ0L7vmgQmZwu68mz4BhtR55cY8h6tQ4SiZF9BnBVHRZZ8ni5/v7f1 Qwn/85jpc77r5qSSW/zOpwBmdZ6FAjI5R9Ix8WLg8t+LHInLXJELu6Ae+1IAvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723984818; a=rsa-sha256; cv=none; b=plDPhR+T57iEeYTKyrxxqd29qUDa3eP3V5tw0Roc0o5ICp+aNgI0/l7/35Reky2VF22UZh MZ5sIg17qpl5IYf7YI1zCcz5iVZxCgisiUkSDWYr3xma0pFRkC71KHrqKkuXUGP9Mif5JY 08ihPw5/TfGTjSy78NGqq7/jwOVc4sEnBQ/20ikbObJj8boDY2KSiCkAzJj8YfK+jZ3+cL S2qpd4wHK3nsqVZaKoMN/vmmslf7OVA1jk4W8sMCuAKh7CBVwWvIXOmXUc62phqwyhr+3c OvZgO2WTkGETSrGZaYd2GpPo+Ovysbbc8Gc+CuxCcjvew2d/Al0GjMt0FXFezg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723984818; 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=Yt+vPLYdHgInbkA6BNG7XZn4fWOyy1da43FQkrCPcyA=; b=QrPB7GD+MCAGPdzwxPxby7MkLMiZlW3wflCBsCgpHOIoWgPuRFluBOZEwG2rZom5/BrsGm la66EM5cCGXB3yw/2h2SkhecEod83wdSLEdFSP6RY/ILHcJn6hW42xWfsFGPAqjvkeDYxX nsNGx7A++IndG+FOJjrzqNExkz77/HQfJoj8JxrNB+eVHxx5Cved5AJacsgWJ0dKiNCWkv luSjfp5E58/GdcnGjVt1joiMA1cGygRwVLkCueQk2Zxa7aPClWTGDq3Vgze24MZiKi1NFm PlGIfdmf4t79I5XTyhmXfQgLksR6J3F1udxza69bBa4sQMYYznikRxFQketBmA== 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 4WmwL970GdzZ8g; Sun, 18 Aug 2024 12:40:17 +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 47ICeHBK063699; Sun, 18 Aug 2024 12:40:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47ICeHm9063696; Sun, 18 Aug 2024 12:40:17 GMT (envelope-from git) Date: Sun, 18 Aug 2024 12:40:17 GMT Message-Id: <202408181240.47ICeHm9063696@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: 957454977fba - main - databases/mariadb114-server: Update to 11.4.3 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: 957454977fba96ef72286c46aa00befc9d9cd492 Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=957454977fba96ef72286c46aa00befc9d9cd492 commit 957454977fba96ef72286c46aa00befc9d9cd492 Author: Bernard Spil AuthorDate: 2024-08-18 12:38:49 +0000 Commit: Bernard Spil CommitDate: 2024-08-18 12:38:49 +0000 databases/mariadb114-server: Update to 11.4.3 * Fix build with ports LibreSSL [1] * Clean up binary references in cnf * Create proper sample files and default conf PR: 274494 Reported by: Ivan Rozhuk --- databases/mariadb114-client/pkg-plist | 4 +- databases/mariadb114-connector-c/Makefile | 12 + databases/mariadb114-connector-c/distinfo | 3 + databases/mariadb114-connector-c/pkg-descr | 6 + databases/mariadb114-connector-c/pkg-plist | 150 +++++ databases/mariadb114-server/Makefile | 13 +- databases/mariadb114-server/distinfo | 6 +- .../files/patch-mysys__ssl_openssl.c | 15 + .../files/patch-storage_columnstore-tr1 | 689 +++++++++++++++++++++ databases/mariadb114-server/files/pkg-message.in | 8 +- .../mariadb114-server/files/server.cnf.sample.in | 16 +- databases/mariadb114-server/pkg-plist | 8 +- 12 files changed, 904 insertions(+), 26 deletions(-) diff --git a/databases/mariadb114-client/pkg-plist b/databases/mariadb114-client/pkg-plist index 7c863425749f..2efc25cdc504 100644 --- a/databases/mariadb114-client/pkg-plist +++ b/databases/mariadb114-client/pkg-plist @@ -43,8 +43,8 @@ bin/mysqltest bin/mytop bin/replace bin/resolve_stack_dump -%%ETCDIR%%/conf.d/client.cnf.sample -%%ETCDIR%%/my.cnf.sample +@sample %%ETCDIR%%/conf.d/client.cnf.sample +@sample %%ETCDIR%%/my.cnf.sample include/mysql/errmsg.h include/mysql/ma_list.h include/mysql/ma_pvio.h diff --git a/databases/mariadb114-connector-c/Makefile b/databases/mariadb114-connector-c/Makefile new file mode 100644 index 000000000000..15501b91c787 --- /dev/null +++ b/databases/mariadb114-connector-c/Makefile @@ -0,0 +1,12 @@ +PORTNAME= mariadb +PKGNAMESUFFIX= 114-connector-c + +COMMENT= Multithreaded SQL database (client) + +MASTERDIR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX:C/-connector-c/-server/} + +LICENSE_FILE?= ${WRKSRC}/COPYING.LIB + +PLIST= ${.CURDIR}/pkg-plist + +.include "${MASTERDIR}/Makefile" diff --git a/databases/mariadb114-connector-c/distinfo b/databases/mariadb114-connector-c/distinfo new file mode 100644 index 000000000000..d501ccd5997a --- /dev/null +++ b/databases/mariadb114-connector-c/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1703845639 +SHA256 (mariadb-connector-c-3.3.8-src.tar.gz) = f9f076b4aa9fb22cc94b24f82c80f9ef063805ecd6533a2eb5d5060cf93833e8 +SIZE (mariadb-connector-c-3.3.8-src.tar.gz) = 1393368 diff --git a/databases/mariadb114-connector-c/pkg-descr b/databases/mariadb114-connector-c/pkg-descr new file mode 100644 index 000000000000..258f2007a9b0 --- /dev/null +++ b/databases/mariadb114-connector-c/pkg-descr @@ -0,0 +1,6 @@ +The MariaDB Connector/C is used to connect applications developed in C/C++ +to MariaDB and MySQL databases. MySQL Connector/C is LGPL licensed. + +Parts of MariaDB Connector/C are derived from PHP\'s mysqlnd extension and +the original LGPL MySQL client library for MySQL 3.23. The rest of the code +is written by developers at MariaDB Corporation Ab. diff --git a/databases/mariadb114-connector-c/pkg-plist b/databases/mariadb114-connector-c/pkg-plist new file mode 100644 index 000000000000..5ebcc5330524 --- /dev/null +++ b/databases/mariadb114-connector-c/pkg-plist @@ -0,0 +1,150 @@ +bin/mariadb_config +include/mariadb/errmsg.h +include/mariadb/ma_list.h +include/mariadb/ma_pvio.h +include/mariadb/ma_tls.h +include/mariadb/mariadb/ma_io.h +include/mariadb/mariadb_com.h +include/mariadb/mariadb_ctype.h +include/mariadb/mariadb_dyncol.h +include/mariadb/mariadb_rpl.h +include/mariadb/mariadb_stmt.h +include/mariadb/mariadb_version.h +include/mariadb/mysql.h +include/mariadb/mysql/client_plugin.h +include/mariadb/mysql/plugin_auth.h +include/mariadb/mysql/plugin_auth_common.h +include/mariadb/mysqld_error.h +lib/mariadb/libmariadb.a +lib/mariadb/libmariadb.so +lib/mariadb/libmariadb.so.3 +lib/mariadb/libmariadbclient.a +lib/mariadb/plugin/auth_gssapi_client.so +lib/mariadb/plugin/caching_sha2_password.so +lib/mariadb/plugin/client_ed25519.so +lib/mariadb/plugin/dialog.so +lib/mariadb/plugin/mysql_clear_password.so +lib/mariadb/plugin/remote_io.so +lib/mariadb/plugin/sha256_password.so +lib/mariadb/plugin/zstd.so +libdata/pkgconfig/libmariadb.pc +share/man/man3/mariadb_cancel.3.gz +share/man/man3/mariadb_connection.3.gz +share/man/man3/mariadb_dyncol_check.3.gz +share/man/man3/mariadb_dyncol_column_cmp_named.3.gz +share/man/man3/mariadb_dyncol_column_count.3.gz +share/man/man3/mariadb_dyncol_create_many_named.3.gz +share/man/man3/mariadb_dyncol_create_many_num.3.gz +share/man/man3/mariadb_dyncol_exists_named.3.gz +share/man/man3/mariadb_dyncol_exists_num.3.gz +share/man/man3/mariadb_dyncol_free.3.gz +share/man/man3/mariadb_dyncol_list_named.3.gz +share/man/man3/mariadb_dyncol_list_num.3.gz +share/man/man3/mariadb_dyncol_unpack.3.gz +share/man/man3/mariadb_dyncol_update_many_named.3.gz +share/man/man3/mariadb_dyncol_update_many_num.3.gz +share/man/man3/mariadb_get_infov.3.gz +share/man/man3/mariadb_reconnect.3.gz +share/man/man3/mariadb_rpl_close.3.gz +share/man/man3/mariadb_rpl_fetch.3.gz +share/man/man3/mariadb_rpl_get_optionsv.3.gz +share/man/man3/mariadb_rpl_open.3.gz +share/man/man3/mariadb_rpl_optionsv.3.gz +share/man/man3/mariadb_stmt_execute_direct.3.gz +share/man/man3/mariadb_stmt_fetch_fields.3.gz +share/man/man3/mysql_affected_rows.3.gz +share/man/man3/mysql_autocommit.3.gz +share/man/man3/mysql_change_user.3.gz +share/man/man3/mysql_close.3.gz +share/man/man3/mysql_commit.3.gz +share/man/man3/mysql_data_seek.3.gz +share/man/man3/mysql_errno.3.gz +share/man/man3/mysql_error.3.gz +share/man/man3/mysql_fetch_field.3.gz +share/man/man3/mysql_fetch_field_direct.3.gz +share/man/man3/mysql_fetch_fields.3.gz +share/man/man3/mysql_fetch_lengths.3.gz +share/man/man3/mysql_fetch_row.3.gz +share/man/man3/mysql_field_count.3.gz +share/man/man3/mysql_field_seek.3.gz +share/man/man3/mysql_field_tell.3.gz +share/man/man3/mysql_free_result.3.gz +share/man/man3/mysql_get_character_set_info.3.gz +share/man/man3/mysql_get_client_info.3.gz +share/man/man3/mysql_get_client_version.3.gz +share/man/man3/mysql_get_host_info.3.gz +share/man/man3/mysql_get_proto_info.3.gz +share/man/man3/mysql_get_server_info.3.gz +share/man/man3/mysql_get_server_version.3.gz +share/man/man3/mysql_get_socket.3.gz +share/man/man3/mysql_get_ssl_cipher.3.gz +share/man/man3/mysql_hex_string.3.gz +share/man/man3/mysql_info.3.gz +share/man/man3/mysql_init.3.gz +share/man/man3/mysql_kill.3.gz +share/man/man3/mysql_more_results.3.gz +share/man/man3/mysql_next_result.3.gz +share/man/man3/mysql_num_fields.3.gz +share/man/man3/mysql_num_rows.3.gz +share/man/man3/mysql_options.3.gz +share/man/man3/mysql_options4.3.gz +share/man/man3/mysql_optionsv.3.gz +share/man/man3/mysql_ping.3.gz +share/man/man3/mysql_query.3.gz +share/man/man3/mysql_read_query_result.3.gz +share/man/man3/mysql_real_connect.3.gz +share/man/man3/mysql_real_escape_string.3.gz +share/man/man3/mysql_real_query.3.gz +share/man/man3/mysql_refresh.3.gz +share/man/man3/mysql_reset_connection.3.gz +share/man/man3/mysql_rollback.3.gz +share/man/man3/mysql_row_seek.3.gz +share/man/man3/mysql_row_tell.3.gz +share/man/man3/mysql_select_db.3.gz +share/man/man3/mysql_send_query.3.gz +share/man/man3/mysql_server_end.3.gz +share/man/man3/mysql_server_init.3.gz +share/man/man3/mysql_session_track_get_first.3.gz +share/man/man3/mysql_session_track_get_next.3.gz +share/man/man3/mysql_set_character_set.3.gz +share/man/man3/mysql_set_server_option.3.gz +share/man/man3/mysql_shutdown.3.gz +share/man/man3/mysql_sqlstate.3.gz +share/man/man3/mysql_ssl_set.3.gz +share/man/man3/mysql_stat.3.gz +share/man/man3/mysql_stmt_affected_rows.3.gz +share/man/man3/mysql_stmt_attr_get.3.gz +share/man/man3/mysql_stmt_attr_set.3.gz +share/man/man3/mysql_stmt_bind_param.3.gz +share/man/man3/mysql_stmt_bind_result.3.gz +share/man/man3/mysql_stmt_close.3.gz +share/man/man3/mysql_stmt_data_seek.3.gz +share/man/man3/mysql_stmt_errno.3.gz +share/man/man3/mysql_stmt_error.3.gz +share/man/man3/mysql_stmt_execute.3.gz +share/man/man3/mysql_stmt_fetch.3.gz +share/man/man3/mysql_stmt_fetch_column.3.gz +share/man/man3/mysql_stmt_field_count.3.gz +share/man/man3/mysql_stmt_free_result.3.gz +share/man/man3/mysql_stmt_init.3.gz +share/man/man3/mysql_stmt_insert_id.3.gz +share/man/man3/mysql_stmt_more_results.3.gz +share/man/man3/mysql_stmt_next_result.3.gz +share/man/man3/mysql_stmt_num_rows.3.gz +share/man/man3/mysql_stmt_param_count.3.gz +share/man/man3/mysql_stmt_param_metadata.3.gz +share/man/man3/mysql_stmt_prepare.3.gz +share/man/man3/mysql_stmt_reset.3.gz +share/man/man3/mysql_stmt_result_metadata.3.gz +share/man/man3/mysql_stmt_row_seek.3.gz +share/man/man3/mysql_stmt_row_tell.3.gz +share/man/man3/mysql_stmt_send_long_data.3.gz +share/man/man3/mysql_stmt_sqlstate.3.gz +share/man/man3/mysql_stmt_store_result.3.gz +share/man/man3/mysql_stmt_warning_count.3.gz +share/man/man3/mysql_store_result.3.gz +share/man/man3/mysql_thread_end.3.gz +share/man/man3/mysql_thread_id.3.gz +share/man/man3/mysql_thread_init.3.gz +share/man/man3/mysql_use_result.3.gz +share/man/man3/mysql_warning_count.3.gz diff --git a/databases/mariadb114-server/Makefile b/databases/mariadb114-server/Makefile index aedd8e523081..abdb55961c63 100644 --- a/databases/mariadb114-server/Makefile +++ b/databases/mariadb114-server/Makefile @@ -1,5 +1,5 @@ PORTNAME?= mariadb -PORTVERSION= 11.4.2 +PORTVERSION= 11.4.3 CATEGORIES= databases MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \ https://mirror.one.com/${SITESDIR}/ \ @@ -69,6 +69,7 @@ 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 @@ -269,15 +270,25 @@ post-install: ${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 diff --git a/databases/mariadb114-server/distinfo b/databases/mariadb114-server/distinfo index 87493a0396ee..7cf506b1f49a 100644 --- a/databases/mariadb114-server/distinfo +++ b/databases/mariadb114-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1718527565 -SHA256 (mariadb-11.4.2.tar.gz) = 8c600e38adb899316c1cb11c68b87979668f4fb9d858000e347e6d8b7abe51b0 -SIZE (mariadb-11.4.2.tar.gz) = 107373265 +TIMESTAMP = 1723390111 +SHA256 (mariadb-11.4.3.tar.gz) = 6f0017b9901bb1897de0eed21caef9ffa9d66ef559345a0d8a6f011308413ece +SIZE (mariadb-11.4.3.tar.gz) = 108166685 diff --git a/databases/mariadb114-server/files/patch-mysys__ssl_openssl.c b/databases/mariadb114-server/files/patch-mysys__ssl_openssl.c index dd66a716fa84..8a141435bd67 100644 --- a/databases/mariadb114-server/files/patch-mysys__ssl_openssl.c +++ b/databases/mariadb114-server/files/patch-mysys__ssl_openssl.c @@ -12,3 +12,18 @@ #else #include +@@ -36,8 +36,12 @@ + static uint testing; + static size_t alloc_size, alloc_count; + +-static void *coc_malloc(size_t size, const char *f __attribute__((unused)), +- int l __attribute__((unused))) ++static void *coc_malloc(size_t size ++#if !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x30500000L) ++ , const char *f __attribute__((unused)), ++ int l __attribute__((unused)) ++#endif ++) + { + if (unlikely(testing)) + { diff --git a/databases/mariadb114-server/files/patch-storage_columnstore-tr1 b/databases/mariadb114-server/files/patch-storage_columnstore-tr1 new file mode 100644 index 000000000000..863acf8fe0c5 --- /dev/null +++ b/databases/mariadb114-server/files/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 + #include + #include +-#include ++#include + #include + #include + #include + #include +-#include ++#include + #include + #include + 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 + #include + #include +-#include ++#include + + #include + #include +--- 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 + #include "brm.h" +-#include ++#include + + 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 + #include + #include +-#include ++#include + + #include + +--- 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 + #include + #include +-#include ++#include + using namespace std; + + #include +--- 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 ++#include + + #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 + #include + #include +-#include ++#include + #include + #include + #include + #include + #include +-#include ++#include + #include + #include + 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 + #include + #include +-#include +-#include ++#include ++#include + #include + #include + #include +--- 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 + #include + #include +-#include +-#include ++#include ++#include + #include + #include + #include +--- 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 + #include + #include +-#include +-#include ++#include ++#include + #include + #include + #include +--- 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 + #include + #include +-#include ++#include + #include + #include + #include +--- 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 +-#include ++#include + 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 + #include + #include +-#include ++#include + #include + #include + +--- 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 + #include + #include +-#include +-#include ++#include ++#include + #include + #include + #include +--- 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 + #include +-#include ++#include + + #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 + #include + #include +-#include ++#include + #include + + #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 + #include + #include +-#include ++#include + #include + + #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 + #include + #include +-#include +-#include ++#include ++#include + #include + #include + +--- 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 +-#include +-#include ++#include ++#include + #include + #include + +--- 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 + #include + #include +-#include ++#include + + #include + #include +--- 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 + #include + #include +-#include ++#include + + 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 ++#include + + #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 +-#include ++#include + + #include + +--- 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 + #include +-#include ++#include + #include + + #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 + #include + +-#include ++#include + + #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 + #include + #include +-#include ++#include + + #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 + + #include +-#include ++#include + + #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 + #include + #include +-#include ++#include + + #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 + #include + #include +-#include ++#include + + #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 + #include + #include +-#include ++#include + + #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 + #include + #include +-#include ++#include + + #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 + #include + #include +-#include ++#include + + #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 + #include + #include +-#include ++#include + + #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 + #include + #include +-#include ++#include + + #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 + #include + #include +-#include ++#include + + #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 + #include + #include +-#include ++#include + + #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 + #include + #include +-#include ++#include + + #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 + #include + #include +-#include ++#include + + #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 + #include + #include +-#include ++#include + + #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 + #include + #include +-#include +-#include ++#include ++#include + #include + + #include +--- 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 + #include + #include +-#include ++#include + + #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 ++#include + #include + + /** +--- 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 + #include + #include +-#include ++#include + + #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 + #include + #include +-#include ++#include + + #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 + #include + #include +-#include ++#include + + #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 + #include + #include +-#include ++#include + #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 + #include + #include +-#include ++#include + + #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 + #include + #include +-#include ++#include + + #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 + +-#include ++#include + + #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 ++#include + #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 ++#include + #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 + #include + #include +-#include ++#include + + #include + #include +--- 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 + #include + #include +-#include ++#include + #include + + // #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 + #include +-#include ++#include + #include + + #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 + #include + #include +-#include ++#include + #include + + #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 *** 117 LINES SKIPPED ***