uw Tue, 20 Oct 2009 12:41:58 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=289792
Log:
Skipping tests if InnoDB is available but disabled. I wonder what InnoDB status
comes next...
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqli/tests/015.phpt
U
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_change_user_rollback.phpt
U php/php-src/trunk/ext/mysqli/tests/015.phpt
U php/php-src/trunk/ext/mysqli/tests/mysqli_change_user_rollback.phpt
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/015.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/015.phpt 2009-10-20
12:31:04 UTC (rev 289791)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/015.phpt 2009-10-20
12:41:58 UTC (rev 289792)
@@ -11,8 +11,9 @@
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--
Modified:
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_change_user_rollback.phpt
===================================================================
---
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_change_user_rollback.phpt
2009-10-20 12:31:04 UTC (rev 289791)
+++
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_change_user_rollback.phpt
2009-10-20 12:41:58 UTC (rev 289792)
@@ -12,8 +12,9 @@
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--
Modified: php/php-src/trunk/ext/mysqli/tests/015.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/015.phpt 2009-10-20 12:31:04 UTC (rev
289791)
+++ php/php-src/trunk/ext/mysqli/tests/015.phpt 2009-10-20 12:41:58 UTC (rev
289792)
@@ -11,8 +11,9 @@
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--
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_change_user_rollback.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_change_user_rollback.phpt
2009-10-20 12:31:04 UTC (rev 289791)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_change_user_rollback.phpt
2009-10-20 12:41:58 UTC (rev 289792)
@@ -12,8 +12,9 @@
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--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
