Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12257] Use MyISAM in PHP 5.3 environment such that FULLTEXT tests run.
This commit is contained in:
Joas Schilling 2014-03-27 14:33:20 +01:00
commit 3bb843190f

View file

@ -24,6 +24,7 @@ install:
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 [ '$TRAVIS_PHP_VERSION' = '5.3' -a '$DB' = 'mysql' ]; then mysql -e 'SET GLOBAL storage_engine=MyISAM;'; fi"
- sh -c "if [ '$DB' = 'mysql' -o '$DB' = 'mariadb' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi"
script: