summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Wendel <uw@php.net>2009-10-20 12:41:58 +0000
committerUlf Wendel <uw@php.net>2009-10-20 12:41:58 +0000
commitad8d9329bb37aab998a27071da722bf3040016e0 (patch)
tree4fd8309e1d1c942acc981cbab07993b8b3ee21c2
parentffbf8c95955322e58bc9d22daed7652ba7a96b38 (diff)
downloadphp-git-ad8d9329bb37aab998a27071da722bf3040016e0.tar.gz
Skipping tests if InnoDB is available but disabled. I wonder what InnoDB status comes next...
-rw-r--r--ext/mysqli/tests/015.phpt5
-rw-r--r--ext/mysqli/tests/mysqli_change_user_rollback.phpt5
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--