aboutsummaryrefslogtreecommitdiffstats
path: root/travis
diff options
context:
space:
mode:
Diffstat (limited to 'travis')
-rwxr-xr-xtravis/setup-mariadb.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/travis/setup-mariadb.sh b/travis/setup-mariadb.sh
index 2e974da8eb..02520b1c2c 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
@@ -31,3 +34,5 @@ USE mysql;
UPDATE user SET Password = PASSWORD('') where User = 'root';
FLUSH PRIVILEGES;
" | mysql -u root -prootpasswd
+
+mysql --version