[libdbd-mysql-perl] 01/02: debian/tests/pkg-perl/smoke-setup: initialize MySQL server with --no-defaults.

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository libdbd-mysql-perl.

commit 5460acb9bb65165d313d19a2b795a23e8b14971b
Author: gregor herrmann <gregoa at debian.org>
Date:   Thu Oct 27 16:57:35 2016 +0200

    debian/tests/pkg-perl/smoke-setup: initialize MySQL server with --no-defaults.
    
    Otherwise we (sometimes?!) end up with the data directory in the wrong place.
    
    Closes: #842167
---
 debian/tests/pkg-perl/smoke-setup | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/tests/pkg-perl/smoke-setup b/debian/tests/pkg-perl/smoke-setup
index 0ca0cc8..70515ab 100755
--- a/debian/tests/pkg-perl/smoke-setup
+++ b/debian/tests/pkg-perl/smoke-setup
@@ -2,12 +2,14 @@
 
 [ -z "$ADTTMP" ] || cd $TDIR
 
+rm -rf ${MYSQL_DIR}
+
 # redirect STDERR to STDIN, autopkgtest fails otherwise
 
 if mysql --version | grep -q MariaDB; then
 	mysql_install_db --no-defaults --datadir=${MYSQL_DIR} --force --skip-name-resolve --explicit_defaults_for_timestamp --user=${MYSQL_USER} 2>&1
 else
-	/usr/sbin/mysqld --initialize --datadir=${MYSQL_DIR} --explicit_defaults_for_timestamp --user=${MYSQL_USER} 2>&1
+	/usr/sbin/mysqld --no-defaults --initialize --datadir=${MYSQL_DIR} --explicit_defaults_for_timestamp --user=${MYSQL_USER} 2>&1
 fi
 
 /usr/sbin/mysqld --no-defaults --user=${MYSQL_USER} --socket=${MYSQL_UNIX_PORT} --datadir=${MYSQL_DIR} --pid-file=${MYSQL_PIDFILE} --explicit_defaults_for_timestamp --skip-networking  --skip-grant-tables 2>&1 &
@@ -16,7 +18,7 @@ while ! /usr/bin/mysqladmin --socket=${MYSQL_UNIX_PORT} ping 2>&1 ; do
 	sleep 3
 	attempts=$((attempts+1))
 	if [ ${attempts} -gt 10 ] ; then
-		echo "skipping test, mysql server could not be contacted after 30 seconds"
+		echo "skipping test, mariadb/mysql server could not be contacted after 30 seconds"
 		exit 1
 	fi
 done

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libdbd-mysql-perl.git