From nobody Fri Jan 7 12:13:23 2022 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 898E41929837; Fri, 7 Jan 2022 12:13:23 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JVhvR22rrz3vnp; Fri, 7 Jan 2022 12:13:23 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 25F503181; Fri, 7 Jan 2022 12:13:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 207CDN4O027071; Fri, 7 Jan 2022 12:13:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 207CDNit027070; Fri, 7 Jan 2022 12:13:23 GMT (envelope-from git) Date: Fri, 7 Jan 2022 12:13:23 GMT Message-Id: <202201071213.207CDNit027070@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jochen Neumeister Subject: git: a025389152de - main - databases/mysql80-server: add patch for malloc-lib 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: joneum X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a025389152de64d806e403a680dc053ae41ade77 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641557603; 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=6uXSjkfbUao50iuzUazZTeS1gg/oXWfdGw+QccORVNc=; b=BnaNmWuOQCXRxzdkvhp+5UqpuEvqH2cBUkUgaccF1r+Lya8VRB4JkbbGJQEqNsNV8LC3k4 3aTgqHBp/AMOVHcXAEP8PmkYSiYNIg8YzaYpa8p5GmAVnC3AZ1UsjV6QFLN0UzahNEEJG4 rfwHlgfQ/AWE290NGEe9EKSSg+1Pw9ffkECwXxVFNmQnPmGoJqte2LJhUYYoZItVQm17IY UK602kjY/1SxNgjCb0jDZo8KZP8CpKZg64GXb1yOSz2gvO8COtqZ8IrB+kED7TYXVmpS5l T0eSSDFdi8L4O5/sws241Yt1kMWIFRKr1IDmQ9v1kiWRlC1jLS5bPGPR+5AV4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641557603; a=rsa-sha256; cv=none; b=Do4QI+kwH0PPRUlmX7UoDxvaDiNgkVVbIgMo5pkNqRFseORNdBcG4xFk2Jn8HTWE+tqKoK 63W03STf2IR0Hmy20K5BQkZPBa8V3sHSFJEXyBznUBi9YCLLDvl0CmFcDfMeXaT3PC8sp5 Yq1HnSLXDSbaD8Ffx/a+LyBYC9EdAqHZ0k8xYTyh8XDRjpc6YkiWy9aHMhUdP2MFSUTNS0 e2wgT18D91Mq8l6a/w8Fbg3an7QLlwqekiA8mcfaGod/0UWvnzeoAm2ol8ZXgMqqrT1Xw0 CszWlBC9nyrrNyK4uWF330o4iW5PA2VO3/iN/vhj0mVTMjP0kwHG1ewkDKdpVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by joneum: URL: https://cgit.FreeBSD.org/ports/commit/?id=a025389152de64d806e403a680dc053ae41ade77 commit a025389152de64d806e403a680dc053ae41ade77 Author: Jochen Neumeister AuthorDate: 2022-01-07 12:10:00 +0000 Commit: Jochen Neumeister CommitDate: 2022-01-07 12:13:17 +0000 databases/mysql80-server: add patch for malloc-lib forked from mysql57-server: https://svnweb.freebsd.org/changeset/ports/548590 Log: MySQL 5.7 mysqld_safe allows malloc-lib files only in certain locations. google-perftools port puts libtcmalloc_minimal.so inside /usr/local/lib To use tcmalloc memory allocator we need mysqld_safe to load libraries from /usr/local/lib More information about why to use tcmalloc instead of jemalloc here: https://forums.freebsd.org/threads/freebsd-12-x-and-mysql-5-7-and-importing-file-with-lots-of-small-lines-exhaust-ram-and-swap.72733/ PR: 259816 Sponsored by: Netzkommune GmbH --- .../files/patch-scripts_mysqld__safe.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/databases/mysql80-server/files/patch-scripts_mysqld__safe.txt b/databases/mysql80-server/files/patch-scripts_mysqld__safe.txt new file mode 100644 index 000000000000..7da369b97b60 --- /dev/null +++ b/databases/mysql80-server/files/patch-scripts_mysqld__safe.txt @@ -0,0 +1,19 @@ +--- scripts/mysqld_safe.sh.orig 2022-01-07 11:33:53.643546000 +0100 ++++ scripts/mysqld_safe.sh 2022-01-07 11:37:41.505101000 +0100 +@@ -360,7 +360,7 @@ mysqld_ld_preload_text() { + # running mysqld. See ld.so for details. + set_malloc_lib() { + # This list is kept intentionally simple. +- malloc_dirs="/usr/lib /usr/lib64 /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu" ++ malloc_dirs="/usr/lib /usr/lib64 /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu /usr/local/lib" + malloc_lib="$1" + + # Allow --malloc-lib='' to override other settings +@@ -379,6 +379,7 @@ set_malloc_lib() { + /usr/lib64) ;; + /usr/lib/i386-linux-gnu) ;; + /usr/lib/x86_64-linux-gnu) ;; ++ /usr/local/lib) ;; + *) + log_error "--malloc-lib must be located in one of the directories: $malloc_dirs" + exit 1