diff options
| author | Andrey Hristov <andrey@php.net> | 2010-05-11 15:49:03 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2010-05-11 15:49:03 +0000 |
| commit | cab261ea16ad3c30a56ce9a78d64fe95ff3352a4 (patch) | |
| tree | 3e996544761e64a52702c3e6e4f37c1b492867c8 | |
| parent | 98585ccb37673e3e60d9c0b44687c606b7333d0d (diff) | |
| download | php-git-cab261ea16ad3c30a56ce9a78d64fe95ff3352a4.tar.gz | |
Fix for mysqli_stmt_execute.phpt, should be ran only against
4.1+ servers. MySQL's SLEEP function is available since 5.0.12, thus
the tests that use this function should be ran only if the server
is at least 5.0.12.
| -rw-r--r-- | ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt | 12 | ||||
| -rw-r--r-- | ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt | 12 | ||||
| -rw-r--r-- | ext/mysqli/tests/mysqli_stmt_execute.phpt | 6 |
3 files changed, 26 insertions, 4 deletions
diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt index 20a4e661ab..8b5e7d6a48 100644 --- a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt +++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt @@ -6,8 +6,16 @@ require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); -if (!stristr(mysqli_get_client_info(), 'mysqlnd')) - die("skip: test applies only to mysqlnd"); +if (!stristr(mysqli_get_client_info(), 'mysqlnd')) { + die("skip: test applies only to mysqlnd"); +} + +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error())); +} +if (mysqli_get_server_version($link) <= 50011) { + die(sprintf('skip Needs MySQL 5.0.12+, found version %d.', mysqli_get_server_version($link))); +} ?> --INI-- default_socket_timeout=1 diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt index 171c806b91..dd34d7da62 100644 --- a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt +++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt @@ -6,8 +6,16 @@ require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); -if (!stristr(mysqli_get_client_info(), 'mysqlnd')) - die("skip: test applies only to mysqlnd"); +if (!stristr(mysqli_get_client_info(), 'mysqlnd')) { + die("skip: test applies only to mysqlnd"); +} + +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error())); +} +if (mysqli_get_server_version($link) <= 50011) { + die(sprintf('skip Needs MySQL 5.0.12+, found version %d.', mysqli_get_server_version($link))); +} ?> --INI-- default_socket_timeout=10 diff --git a/ext/mysqli/tests/mysqli_stmt_execute.phpt b/ext/mysqli/tests/mysqli_stmt_execute.phpt index 61763864e5..85ae80c51e 100644 --- a/ext/mysqli/tests/mysqli_stmt_execute.phpt +++ b/ext/mysqli/tests/mysqli_stmt_execute.phpt @@ -5,6 +5,12 @@ mysqli_stmt_execute() require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error())); +} +if (mysqli_get_server_version($link) <= 40100) { + die(sprintf('skip Needs MySQL 4.1+, found version %d.', mysqli_get_server_version($link))); +} ?> --FILE-- <?php |