From 87a4f09cbf8a2970969d9a03d28f2242932b16a3 Mon Sep 17 00:00:00 2001 From: Ulf Wendel Date: Tue, 20 Oct 2009 12:41:58 +0000 Subject: [PATCH] Skipping tests if InnoDB is available but disabled. I wonder what InnoDB status comes next... --- ext/mysqli/tests/015.phpt | 5 +++-- ext/mysqli/tests/mysqli_change_user_rollback.phpt | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ext/mysqli/tests/015.phpt b/ext/mysqli/tests/015.phpt index f42129f872..c4f693ff12 100644 --- 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 a57f80b676..97c2bd851c 100644 --- 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-- -- 2.50.0