From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1707417-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id BBA2B15813A
	for <garchives@archives.gentoo.org>; Thu, 09 Jan 2025 07:58:01 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id CD250E041F;
	Thu, 09 Jan 2025 07:58:00 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
	(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)
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id B2218E041F
	for <gentoo-commits@lists.gentoo.org>; Thu, 09 Jan 2025 07:58:00 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(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)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id A84A9341C4B
	for <gentoo-commits@lists.gentoo.org>; Thu, 09 Jan 2025 07:57:59 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 036FF1870
	for <gentoo-commits@lists.gentoo.org>; Thu, 09 Jan 2025 07:57:58 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1736409456.227eaf7997e974de7ff0886d6a2762ec3f16a347.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-c/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.ebuild dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
X-VCS-Directories: dev-db/mariadb-connector-c/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 227eaf7997e974de7ff0886d6a2762ec3f16a347
X-VCS-Branch: master
Date: Thu, 09 Jan 2025 07:57:58 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 3bcf13b2-d7f1-4bb6-8103-69462ea5f6d2
X-Archives-Hash: 306d23ab62a43b819230aa2a92e3a850

commit:     227eaf7997e974de7ff0886d6a2762ec3f16a347
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  9 07:56:58 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan  9 07:57:36 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=227eaf79

Revert "dev-db/mariadb-connector-c: pass --no-defaults to mysqladmin too"

This reverts commit 506481663946acf3d4522593975a763cdaf0f5e0.

This doesn't work. Serves me right for a speculative fix.

Bug: https://bugs.gentoo.org/942287
Closes: https://bugs.gentoo.org/947756
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.ebuild |  2 +-
 dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild  | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.ebuild
index fdf4b945fa06..eb4f7ef8cec1 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.ebuild
@@ -109,7 +109,7 @@ multilib_src_test() {
 	mysqld --no-defaults --datadir="${T}/mysql/data" --socket="${T}/mysql/mysql.sock" --skip-grant-tables --skip-networking &
 
 	local attempts=0
-	while ! mysqladmin ping --no-defaults --socket="${T}/mysql/mysql.sock" --silent ; do
+	while ! mysqladmin ping --socket="${T}/mysql/mysql.sock" --silent ; do
 		# 5 minutes should be more than enough
 		if [[ ${attempts} -gt 300 ]] ; then
 			die "mysqld not found after 300 seconds, aborting"

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
index 16f992e304e8..45553edc1b5e 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -108,15 +108,8 @@ multilib_src_test() {
 	mysql_install_db --no-defaults --datadir="${T}/mysql/data" || die
 	mysqld --no-defaults --datadir="${T}/mysql/data" --socket="${T}/mysql/mysql.sock" --skip-grant-tables --skip-networking &
 
-	local attempts=0
-	while ! mysqladmin ping --no-defaults --socket="${T}/mysql/mysql.sock" --silent ; do
-		# 5 minutes should be more than enough
-		if [[ ${attempts} -gt 300 ]] ; then
-			die "mysqld not found after 300 seconds, aborting"
-		fi
-
+	while ! mysqladmin ping --socket="${T}/mysql/mysql.sock" --silent ; do
 		sleep 1
-		attempts=$((attempts + 1))
 	done
 
 	cd unittest/libmariadb || die