From: Andrey Hristov <andrey@php.net>
Date: Tue, 11 May 2010 15:27:03 +0000 (+0000)
Subject: These tests should be run only if mysqli uses mysqlnd. Part of fix for
X-Git-Tag: php-5.3.3RC1~184
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fd6f3961f8810d3a3a048167a67c146b1a2df2b1;p=php

These tests should be run only if mysqli uses mysqlnd. Part of fix for
Bug #51712 Test mysql_mysqlnd_read_timeout_long must fail on MySQL4
---

diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt
index 637fd1629e..20a4e661ab 100644
--- a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt
+++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt
@@ -3,8 +3,11 @@ mysqlnd.net_read_timeout > default_socket_timeout
 --SKIPIF--
 <?php
 require_once('skipif.inc');
+require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
-require_once('connect.inc');
+
+if (!stristr(mysqli_get_client_info(), 'mysqlnd'))
+        die("skip: test applies only to mysqlnd");
 ?>
 --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 f5a13c5f63..171c806b91 100644
--- a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt
+++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt
@@ -3,8 +3,11 @@ mysqlnd.net_read_timeout = 0
 --SKIPIF--
 <?php
 require_once('skipif.inc');
+require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
-require_once('connect.inc');
+
+if (!stristr(mysqli_get_client_info(), 'mysqlnd'))
+        die("skip: test applies only to mysqlnd");
 ?>
 --INI--
 default_socket_timeout=10