diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-27 14:32:36 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-27 14:32:36 +0100 |
| commit | 252a8d4e9e21256b6855b938db6dd25a40aee383 (patch) | |
| tree | b40a2c0f97bba81d1c894f7dac9b911006b46b3e | |
| parent | 02c4d4ee7ec1e135397003e6685af4503e9ce40d (diff) | |
| parent | 389bbe32d185a175c0093f992ca91a63deca8e47 (diff) | |
| download | forums-252a8d4e9e21256b6855b938db6dd25a40aee383.tar forums-252a8d4e9e21256b6855b938db6dd25a40aee383.tar.gz forums-252a8d4e9e21256b6855b938db6dd25a40aee383.tar.bz2 forums-252a8d4e9e21256b6855b938db6dd25a40aee383.tar.xz forums-252a8d4e9e21256b6855b938db6dd25a40aee383.zip | |
Merge remote-tracking branch 'bantu/ticket/12257-ascraeus' into develop-ascraeus
* bantu/ticket/12257-ascraeus:
[ticket/12257] Use MyISAM in PHP 5.3 environment such that FULLTEXT tests run.
| -rw-r--r-- | .travis.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index a4e8bdedd3..88c902cd4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: |