Skipping tests if InnoDB is available but disabled. I wonder what InnoDB status comes...

diff --git a/ext/mysqli/tests/015.phpt b/ext/mysqli/tests/015.phpt
index f42129f872bf6dfc682f4f3356c7e38b5ae7faa3..c4f693ff12fa701312ea619461bf9e0ce58e66aa 100644 (file)
--- a/ext/mysqli/tests/015.phpt
+++ b/ext/mysqli/tests/015.phpt
@@ -11,8 +11,9 @@ mysqli autocommit/commit/rollback with innodb
        mysqli_free_result($result);
        mysqli_close($link);
 
-       if ($row[1] == "NO") {
-               printf ("skip innodb support not installed.");
+       if ($row[1] == "DISABLED" || $row[1] == "NO") {
+               printf ("skip innodb support is not installed or enabled.");
+               exit;
        }
 ?>
 --FILE--

diff --git a/ext/mysqli/tests/mysqli_change_user_rollback.phpt b/ext/mysqli/tests/mysqli_change_user_rollback.phpt
index a57f80b676154435f067441732b08e3164f5436b..97c2bd851ca223d11b52f854037a394167791dd4 100644 (file)
--- a/ext/mysqli/tests/mysqli_change_user_rollback.phpt
+++ b/ext/mysqli/tests/mysqli_change_user_rollback.phpt
@@ -12,8 +12,9 @@ $row = mysqli_fetch_row($result);
 mysqli_free_result($result);
 mysqli_close($link);
 
-if ($row[1] == 'NO') {
-       printf ("skip ROLLBACK requires transactional engine InnoDB");
+if ($row[1] == "DISABLED" || $row[1] == "NO") {
+       printf ("skip innodb support is not installed or enabled.");
+       exit;
 }
 ?>
 --FILE--