From 0f64f0edc409ecea94159bb365b7f7efbd311195 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Wed, 16 Oct 2013 00:24:44 +0200 Subject: [ticket/11920] Manually purge mysql-common. PHPBB3-11920 --- travis/setup-mariadb.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'travis') diff --git a/travis/setup-mariadb.sh b/travis/setup-mariadb.sh index 2e974da8eb..6742d27263 100755 --- a/travis/setup-mariadb.sh +++ b/travis/setup-mariadb.sh @@ -11,6 +11,9 @@ VERSION='5.5' # Operating system codename, e.g. "precise" OS_CODENAME=$(lsb_release --codename --short) +# Manually purge MySQL to remove conflicting files (e.g. /etc/mysql/my.cnf) +sudo apt-get purge -qq mysql-common + if ! which add-apt-repository > /dev/null then sudo apt-get update -qq -- cgit v1.2.1 From 5a481bb1763477edbacf530de7c64a729a796084 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Wed, 16 Oct 2013 00:25:07 +0200 Subject: [ticket/11920] Print MariaDB version after successful setup. PHPBB3-11920 --- travis/setup-mariadb.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'travis') diff --git a/travis/setup-mariadb.sh b/travis/setup-mariadb.sh index 6742d27263..02520b1c2c 100755 --- a/travis/setup-mariadb.sh +++ b/travis/setup-mariadb.sh @@ -34,3 +34,5 @@ USE mysql; UPDATE user SET Password = PASSWORD('') where User = 'root'; FLUSH PRIVILEGES; " | mysql -u root -prootpasswd + +mysql --version -- cgit v1.2.1