From e36da012645a6c376b0ecb306ee6b99e5437a410 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Wed, 26 Jul 2017 12:24:57 -0700
Subject: [ticket/15295] Restore tests on mysql and myisam

PHPBB3-15295
---
 .travis.yml              | 4 +++-
 travis/setup-database.sh | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a92c3bb56b..fd5e4da59e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,9 @@ matrix:
     - php: 5.6
       env: DB=mysqli;SLOWTESTS=1
     - php: 5.6
-      env: DB=mysqli
+      env: DB=mysqli # MyISAM
+    - php: 5.6
+      env: DB=mysql
     - php: 7.0
       env: DB=mysqli
     - php: 7.1
diff --git a/travis/setup-database.sh b/travis/setup-database.sh
index cf196e401f..cbd5e93e83 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.5" -a "$DB" == "mysqli" ]
+if [ "$TRAVIS_PHP_VERSION" == "5.6" -a "$DB" == "mysqli" ]
 then
 	mysql -e 'SET GLOBAL storage_engine=MyISAM;'
 fi
-- 
cgit v1.2.1