No reason not to run the tests with libmysql. Its long, long ago that pconnect has...

diff --git a/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt b/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt
index f40965e59423d7cc16304d36c112984b2f64a160..adc267131c7096043f5b3ad99542ce74c5de06f2 100644 (file)
--- a/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt
@@ -5,9 +5,6 @@ Calling connect() on an open persistent connection to create a new persistent co
 require_once('skipif.inc');
 require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
-if (!$IS_MYSQLND)
-       die("skip mysqlnd test only");
-
 ?>
 --INI--
 mysqli.allow_persistent=1

diff --git a/ext/mysqli/tests/mysqli_pconn_disabled.phpt b/ext/mysqli/tests/mysqli_pconn_disabled.phpt
index 1fe6271c7e594df7f83b2fb0f93cb15f198d1a01..7222212db0ec6f6f884cab0fa1d896824276b2e2 100644 (file)
--- a/ext/mysqli/tests/mysqli_pconn_disabled.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_disabled.phpt
@@ -6,9 +6,6 @@ require_once('skipif.inc');
 require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
 
-if (!stristr(mysqli_get_client_info(), 'mysqlnd'))
-       die("skip: only available in mysqlnd");
-
 die("skip TODO - we need to add a user level way to check if CHANGE_USER gets called by pconnect");
 ?>
 --INI--

diff --git a/ext/mysqli/tests/mysqli_pconn_kill.phpt b/ext/mysqli/tests/mysqli_pconn_kill.phpt
index 297dd4cb63242eb10c0eff4fe2cf454812d79149..f8d8d7e8bd501091406932a9fd3c5f8e444b8e89 100755 (executable)
--- a/ext/mysqli/tests/mysqli_pconn_kill.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_kill.phpt
@@ -6,8 +6,6 @@ require_once('skipif.inc');
 require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
 require_once("connect.inc");
-if (!$IS_MYSQLND)
-       die("skip mysqlnd test only");
 ?>
 --INI--
 mysqli.allow_persistent=1

diff --git a/ext/mysqli/tests/mysqli_pconn_limits.phpt b/ext/mysqli/tests/mysqli_pconn_limits.phpt
index 84cd11e59959544c577e0c8aee33ebba8db63745..ee9e1f9cc6d894e4675643dc5150ea4197c6c96d 100644 (file)
--- a/ext/mysqli/tests/mysqli_pconn_limits.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_limits.phpt
@@ -6,9 +6,6 @@ require_once('skipif.inc');
 require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
 require_once("connect.inc");
-if (!$IS_MYSQLND)
-       die("skip mysqlnd test only");
-
 ?>
 --INI--
 mysqli.allow_persistent=1

diff --git a/ext/mysqli/tests/mysqli_pconn_max_links.phpt b/ext/mysqli/tests/mysqli_pconn_max_links.phpt
index 8e755393fe4a009a036c997d5bf5f4d474f7af38..e87ef00b2112f7a2f216a8ad00ccf2bffcb2afbf 100644 (file)
--- a/ext/mysqli/tests/mysqli_pconn_max_links.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_max_links.phpt
@@ -5,14 +5,7 @@ Persistent connections and mysqli.max_links
        require_once('skipif.inc');
        require_once('skipifemb.inc');
        require_once('skipifconnectfailure.inc');
-       require_once('connect.inc');
-
-       if (!$IS_MYSQLND)
-               die("skip mysqlnd only test");
-
-       // we need a second DB user to test for a possible flaw in the ext/mysql[i] code
-       if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-               die(sprintf("skip Cannot connect [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+       require_once('table.inc');
 
        mysqli_query($link, 'DROP USER pcontest');
        mysqli_query($link, 'DROP USER pcontest@localhost');
@@ -54,6 +47,17 @@ mysqli.max_persistent=2
        require_once("connect.inc");
        require_once('table.inc');
 
+
+       if (!mysqli_query($link, 'DROP USER pcontest') ||
+               !mysqli_query($link, 'DROP USER pcontest@localhost') ||
+               !mysqli_query($link, 'CREATE USER pcontest@"%" IDENTIFIED BY "pcontest"') ||
+               !mysqli_query($link, 'CREATE USER pcontest@localhost IDENTIFIED BY "pcontest"') ||
+               !mysqli_query($link, sprintf("GRANT SELECT ON TABLE %s.test TO pcontest@'%%'", $db)) ||
+               !mysqli_query($link, sprintf("GRANT SELECT ON TABLE %s.test TO pcontest@'localhost'", $db))) {
+               printf("[000] Init failed, [%d] %s\n",
+                       mysqli_errno($plink), mysqli_error($plink));
+       }
+
        if (!$plink = my_mysqli_connect('p:' . $host, 'pcontest', 'pcontest', $db, $port, $socket))
                printf("[001] Cannot connect using the second DB user created during SKIPIF, [%d] %s\n",
                        mysqli_connect_errno(), mysqli_connect_error());
@@ -188,5 +192,5 @@ array(2) {
   %unicode|string%(1) "a"
 }
 
-Warning: my_mysqli_connect(): Too many open persistent links (%d) in %s on line %d
+Warning: %s: Too many open persistent links (%d) in %s on line %d
 done!
\ No newline at end of file

diff --git a/ext/mysqli/tests/mysqli_pconn_reuse.phpt b/ext/mysqli/tests/mysqli_pconn_reuse.phpt
index b42800a77d4b69c17c0041e6192bb8e371806271..6e210bd4c5762290a2a4ee20b6680640d42dcbd3 100644 (file)
--- a/ext/mysqli/tests/mysqli_pconn_reuse.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_reuse.phpt
@@ -7,9 +7,6 @@ die("skip TODO - we need to add a user level way to check if CHANGE_USER gets ca
 require_once('skipif.inc');
 require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
-
-if (!stristr(mysqli_get_client_info(), 'mysqlnd'))
-       die("skip: only available in mysqlnd");
 ?>
 --INI--
 mysqli.allow_persistent=1

diff --git a/ext/mysqli/tests/mysqli_pconn_twice.phpt b/ext/mysqli/tests/mysqli_pconn_twice.phpt
index 12800c2ce44d10ed0fe7a639cdd944a997e40a94..5630d4e973a8fd7ee4ed9e59dfa043b8eaefe2a6 100644 (file)
--- a/ext/mysqli/tests/mysqli_pconn_twice.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_twice.phpt
@@ -5,8 +5,6 @@ Calling connect() on an open persistent connection to create a new persistent co
 require_once('skipif.inc');
 require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
-if (!$IS_MYSQLND)
-       die("skip mysqlnd test only");
 
 ?>
 --INI--

diff --git a/ext/mysqli/tests/mysqli_pconnect.phpt b/ext/mysqli/tests/mysqli_pconnect.phpt
index fbb1092e6e62fec6d0c2902d16e9ef32f7e7b04d..734029acb11782615497f174373ad4eefa9820ee 100644 (file)
--- a/ext/mysqli/tests/mysqli_pconnect.phpt
+++ b/ext/mysqli/tests/mysqli_pconnect.phpt
@@ -5,9 +5,6 @@ mysqli_pconnect()
 require_once('skipif.inc');
 require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
-
-if (!stristr(mysqli_get_client_info(), 'mysqlnd'))
-       die("skip: only available in mysqlnd");
 ?>
 --FILE--
 <?php