aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-03-25 00:15:09 +0100
committerAndreas Fischer <bantu@phpbb.com>2014-03-25 00:15:09 +0100
commit389bbe32d185a175c0093f992ca91a63deca8e47 (patch)
treeddf828ab86676b00afc555cbbb18248d73ed3fb3
parent800c779403f8f6e2cba887bdd3e9220a5d5ea922 (diff)
parentca8fa036597578f8782a3f8678029e8b151d01d3 (diff)
downloadforums-389bbe32d185a175c0093f992ca91a63deca8e47.tar
forums-389bbe32d185a175c0093f992ca91a63deca8e47.tar.gz
forums-389bbe32d185a175c0093f992ca91a63deca8e47.tar.bz2
forums-389bbe32d185a175c0093f992ca91a63deca8e47.tar.xz
forums-389bbe32d185a175c0093f992ca91a63deca8e47.zip
Merge pull request #2179 from bantu/ticket/12257
[ticket/12257] Use MyISAM in PHP 5.3 environment such that FULLTEXT test... * bantu/ticket/12257: [ticket/12257] Use MyISAM in PHP 5.3 environment such that FULLTEXT tests run. Conflicts: .travis.yml
-rw-r--r--.travis.yml1
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: