aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Friedman <maf675@gmail.com>2016-09-01 20:35:35 -0700
committerMatt Friedman <maf675@gmail.com>2016-09-01 20:35:35 -0700
commit55d927493c552cc22746dc86ad307ec0e71d6d3f (patch)
tree139c9b348d6c02694e51de7c3d51776843bf7c96
parentMerge branch '3.2.x' (diff)
downloadphpbb-55d927493c552cc22746dc86ad307ec0e71d6d3f.tar.gz
phpbb-55d927493c552cc22746dc86ad307ec0e71d6d3f.tar.bz2
phpbb-55d927493c552cc22746dc86ad307ec0e71d6d3f.zip
[ticket/14761] myisam should be setup on PHP 5.5 (5.4 removed)
PHPBB3-14761
-rwxr-xr-xtravis/setup-database.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/travis/setup-database.sh b/travis/setup-database.sh
index 3771f19073..cf196e401f 100755
--- a/travis/setup-database.sh
+++ b/travis/setup-database.sh
@@ -26,7 +26,7 @@ then
psql -c 'create database phpbb_tests;' -U postgres
fi
-if [ "$TRAVIS_PHP_VERSION" == "5.4" -a "$DB" == "mysqli" ]
+if [ "$TRAVIS_PHP_VERSION" == "5.5" -a "$DB" == "mysqli" ]
then
mysql -e 'SET GLOBAL storage_engine=MyISAM;'
fi