diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-26 21:38:07 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-26 21:38:07 +0200 |
| commit | cfa9d239886d3fca33d7942c0ce5aa36858c014f (patch) | |
| tree | 173a53c95d3bba92c45fb035f4fa1c15aa032e3d /travis/setup-database.sh | |
| parent | 5e3ce27e139342464abd182e14a69e4324d3160f (diff) | |
| parent | 502cbad5a7f8896311a616553cff9d83ccc87497 (diff) | |
| download | forums-cfa9d239886d3fca33d7942c0ce5aa36858c014f.tar forums-cfa9d239886d3fca33d7942c0ce5aa36858c014f.tar.gz forums-cfa9d239886d3fca33d7942c0ce5aa36858c014f.tar.bz2 forums-cfa9d239886d3fca33d7942c0ce5aa36858c014f.tar.xz forums-cfa9d239886d3fca33d7942c0ce5aa36858c014f.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12592] Add PHP 5.4 environment using mysql driver.
[ticket/12592] Rename mysql environment to mysqli.
Diffstat (limited to 'travis/setup-database.sh')
| -rwxr-xr-x | travis/setup-database.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/travis/setup-database.sh b/travis/setup-database.sh index c1917042cd..8c19086191 100755 --- a/travis/setup-database.sh +++ b/travis/setup-database.sh @@ -15,12 +15,12 @@ then psql -c 'create database phpbb_tests;' -U postgres fi -if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysql" ] +if [ "$TRAVIS_PHP_VERSION" == "5.3" -a "$DB" == "mysqli" ] then mysql -e 'SET GLOBAL storage_engine=MyISAM;' fi -if [ "$DB" == "mysql" -o "$DB" == "mariadb" ] +if [ "$DB" == "mysql" -o "$DB" == "mysqli" -o "$DB" == "mariadb" ] then mysql -e 'create database IF NOT EXISTS phpbb_tests;' fi |