From nobody Sun Jun 16 17:14:40 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 4W2KPr4F6Tz5P8GG; Sun, 16 Jun 2024 17:14:40 +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 4W2KPr3gtjz4c01; Sun, 16 Jun 2024 17:14:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718558080; 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=YLmLAwpCRY4P8MDK1IFq696yFOKHwcO8UqUHxtt8pRs=; b=JAWzMjRu8Y8bNjyM+Y2AO/2j8JRruzOewye1R5vAwBbFnz8Vqnn1h8y8DM6nJZ5mEydCaZ 5q3kjmYFZZOBkvP97vrPrS9Dbd/nemx0OaJnfaDSqifi2A59qexkmLI8afaEC5UNdp8mUj hlw1S5fLahs7vXUV7GmgHsp2s16VSCWOOOq3JO3TplQbjcGEV56jFIJJptxfV/we/YKrUe 4KfzpWqrNeK5Y5ascvYgsCCadeSDZqydH8UnTPi3OGN5/BCiabI2fL9adYvAEU57q18o9y vNn5wiVEmf+zuhno3dbxp2bdu+qtF+xLa9a9oImqvlhEQ0IpNamovJP31d5FWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718558080; a=rsa-sha256; cv=none; b=x+6YE/024pW/rmijDTv4/cS01pta1K/jfg/ojOiXFzOAD508jrnmJ//MxSDRN72Yiy4cDd 0JdyUEKnkBcfa3eCGhp9J6GuBqb0mDfSyKfgu7A2LCDLU9KSvA9Jok/wCq/scWdLMEQAGl eJsrfiRgcxhxdsmLDTFQecHUcOrkYZxMJeoREpCXroQgNqStCRGNZlI3Zr+yCZIxDmN+Uw ZjQo6DXyLtrDLENKQnXes3QtldSNOxsI5FhZL3guDnk0LXXqfaZLwe60YeBXEiv2ejVRt5 SJdhuceo02tejLorTF7KPG9YFbVnUZLval1DnMelKWmdHoDxEgKrCCoUewk9OQ== 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=1718558080; 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=YLmLAwpCRY4P8MDK1IFq696yFOKHwcO8UqUHxtt8pRs=; b=hYliJM5Z4LrF7E8Cl8puaig4CSO7NS6/19UgmWDQkjaByWW40sn8ABFdi3S7+Ta1KzHlmE 7Y0w93wlx8Yyp1bts8OnbeFpE/o9fp3kAXB31WXQdTjcodWEJTRGLWj8q3w8MioNsBuPmn Rn+TemmdqxUAmRF4CCUpC9ABq6kQ8HzVSxA5rfVfdLHDuHKD4djwkHBzJG3bXma+gi4LGk 5Y33CFszK92is6nyqGqb5tZ8oMHZkfhAX/qhgxILhb4ynA800PF+bl431K2dP/4tYdnEWs EzByJgUgxCMnvezyRz5anOzFlw0W0ohMkZ1xx9EhgELQfZrdl/XrYNApErXP/Q== 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 4W2KPr3H78zwgc; Sun, 16 Jun 2024 17:14:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45GHEeu2040419; Sun, 16 Jun 2024 17:14:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GHEeIv040416; Sun, 16 Jun 2024 17:14:40 GMT (envelope-from git) Date: Sun, 16 Jun 2024 17:14:40 GMT Message-Id: <202406161714.45GHEeIv040416@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: 9f97021574ac - main - databases/mariadb106-server: Fix hang on restart 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: 9f97021574ac4b7d1ee5641fd58c5e4fa551a9bc Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=9f97021574ac4b7d1ee5641fd58c5e4fa551a9bc commit 9f97021574ac4b7d1ee5641fd58c5e4fa551a9bc Author: Bernard Spil AuthorDate: 2024-06-16 17:11:31 +0000 Commit: Bernard Spil CommitDate: 2024-06-16 17:11:31 +0000 databases/mariadb106-server: Fix hang on restart PR: 279362 Obtained from: https://jira.mariadb.org/browse/MDEV-34254 --- databases/mariadb106-server/Makefile | 2 +- databases/mariadb106-server/files/patch-MDEV-34254 | 52 ++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile index 9195f49ada30..1523df03e7f1 100644 --- a/databases/mariadb106-server/Makefile +++ b/databases/mariadb106-server/Makefile @@ -1,6 +1,6 @@ PORTNAME?= mariadb PORTVERSION= 10.6.18 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= databases MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \ https://mirror.one.com/${SITESDIR}/ \ diff --git a/databases/mariadb106-server/files/patch-MDEV-34254 b/databases/mariadb106-server/files/patch-MDEV-34254 new file mode 100644 index 000000000000..68210424694c --- /dev/null +++ b/databases/mariadb106-server/files/patch-MDEV-34254 @@ -0,0 +1,52 @@ +From 90d376e01710fbc6f7e9eeef3f8c4653d5d4d82e Mon Sep 17 00:00:00 2001 +From: Dave Gosselin +Date: Mon, 13 May 2024 10:36:11 -0400 +Subject: [PATCH] MDEV-34129 mariadb-install-db appears to hang on macOS + +Immediately close down the signal handler loop when we decide to +break connections as it's the start of process termination +anyway, and there's no need to wait once we've invoked break_connections. +--- + sql/mysqld.cc | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +diff --git a/sql/mysqld.cc b/sql/mysqld.cc +index cfc16209251c2..a9960400c17cd 100644 +--- sql/mysqld.cc.orig ++++ sql/mysqld.cc +@@ -2953,6 +2953,15 @@ static void start_signal_handler(void) + DBUG_VOID_RETURN; + } + ++/** Called only from signal_hand function. */ ++static void* exit_signal_handler() ++{ ++ my_thread_end(); ++ signal_thread_in_use= 0; ++ pthread_exit(0); // Safety ++ return nullptr; // Avoid compiler warnings ++} ++ + + /** This threads handles all signals and alarms. */ + /* ARGSUSED */ +@@ -3013,10 +3022,7 @@ pthread_handler_t signal_hand(void *arg __attribute__((unused))) + if (abort_loop) + { + DBUG_PRINT("quit",("signal_handler: calling my_thread_end()")); +- my_thread_end(); +- signal_thread_in_use= 0; +- pthread_exit(0); // Safety +- return 0; // Avoid compiler warnings ++ return exit_signal_handler(); + } + switch (sig) { + case SIGTERM: +@@ -3035,6 +3041,7 @@ pthread_handler_t signal_hand(void *arg __attribute__((unused))) + PSI_CALL_delete_current_thread(); + my_sigset(sig, SIG_IGN); + break_connect_loop(); // MIT THREAD has a alarm thread ++ return exit_signal_handler(); + } + break; + case SIGHUP: