mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/11920] Print MariaDB version after successful setup.
  [ticket/11920] Manually purge mysql-common.
  [ticket/11920] Actually call travis/setup-mariadb.sh.
This commit is contained in:
Andreas Fischer
2013-10-16 02:17:11 +02:00
parent 7afff1e5bd 16ab35c1b5
commit ecc756e12e
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
travis/setup-mariadb.sh
View File

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