gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 5064816639.

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@gentoo.org>
This commit is contained in:
Sam James
2025-01-09 07:56:58 +00:00
parent 8a5cd4af52
commit 227eaf7997
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.ebuild
View File

@@ -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"

11
dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
View File

@@ -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