Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/11920] Print MariaDB version after successful setup.
  [ticket/11920] Manually purge mysql-common.
  [ticket/11920] Actually call travis/setup-mariadb.sh.

.travis.yml

@@ -13,6 +13,7 @@ env:
 before_script:
   - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres; fi"
   - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database phpbb_tests;' -U postgres; fi"
+  - sh -c "if [ '$DB' = 'mariadb' ]; then travis/setup-mariadb.sh; fi"
   - sh -c "if [ '$DB' = 'mysql' -o '$DB' = 'mariadb' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi"
   - travis/install-php-extensions.sh
   - cd phpBB

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