Fix some tests for libmysql

diff --git a/ext/mysqli/tests/bug51647.phpt b/ext/mysqli/tests/bug51647.phpt
index 8fd107a95d5983da07520a2cc29d16dc2e50b14c..ecae650c1ba288a2ddeb6c1243b2d99cd7df8a28 100644 (file)
--- a/ext/mysqli/tests/bug51647.phpt
+++ b/ext/mysqli/tests/bug51647.phpt
@@ -6,6 +6,9 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once("connect.inc");
 
+if (!defined('MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT'))
+    die("skip Requires MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT");
+
 if ($IS_MYSQLND && !extension_loaded("openssl"))
        die("skip PHP streams lack support for SSL. mysqli is compiled to use mysqlnd which uses PHP streams in turn.");
 

diff --git a/ext/mysqli/tests/bug55283.phpt b/ext/mysqli/tests/bug55283.phpt
index 306a4af156a337e8ddc8106caadcedd325ff13f9..023b9f424d022829b84e9fd96bfd1afef4aa84b3 100644 (file)
--- a/ext/mysqli/tests/bug55283.phpt
+++ b/ext/mysqli/tests/bug55283.phpt
@@ -6,6 +6,9 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once("connect.inc");
 
+if (!defined('MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT'))
+    die("skip Requires MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT");
+
 if ($IS_MYSQLND && !extension_loaded("openssl"))
        die("skip PHP streams lack support for SSL. mysqli is compiled to use mysqlnd which uses PHP streams in turn.");
 

diff --git a/ext/mysqli/tests/bug74968.phpt b/ext/mysqli/tests/bug74968.phpt
index c009f864510ee1b6007aee8062a97b40bb8fc3eb..c563c2c56dcafa20de44f893aa51b6dea8120dfc 100644 (file)
--- a/ext/mysqli/tests/bug74968.phpt
+++ b/ext/mysqli/tests/bug74968.phpt
@@ -9,7 +9,7 @@ require_once('skipifconnectfailure.inc');
 <?php
     require_once("connect.inc");
 
-    $mysqli = new mysqli("$host:$port", $user, $passwd, $db);
+    $mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
     abstract class test {
         public $a;
     }

diff --git a/ext/mysqli/tests/mysqli_constants.phpt b/ext/mysqli/tests/mysqli_constants.phpt
index 376dc4f93fe91f8c50f1b1a4d2271f89803e37e3..7087ca0fcd577834277e8267c235656002bdaa04 100644 (file)
--- a/ext/mysqli/tests/mysqli_constants.phpt
+++ b/ext/mysqli/tests/mysqli_constants.phpt
@@ -168,7 +168,9 @@ mysqli.allow_local_infile=1
         "MYSQLI_STMT_ATTR_PREFETCH_ROWS"       => true,
     ));
 
-    $expected_constants['MYSQLI_OPT_SSL_VERIFY_SERVER_CERT'] = true;
+    if ($version < 80000 || $version >= 100000 || $IS_MYSQLND) {
+        $expected_constants['MYSQLI_OPT_SSL_VERIFY_SERVER_CERT'] = true;
+    }
 
     /* pretty dump test, but that is the best way to mimic mysql.c */
     if (defined('MYSQLI_DATA_TRUNCATED'))

diff --git a/ext/mysqli/tests/mysqli_query.phpt b/ext/mysqli/tests/mysqli_query.phpt
index daac374cf797609d517f2d2f8517250943d507e6..b291306faff287226124697f3fb85d225d438026 100644 (file)
--- a/ext/mysqli/tests/mysqli_query.phpt
+++ b/ext/mysqli/tests/mysqli_query.phpt
@@ -115,7 +115,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test"))
 
 mysqli_close($link);
 ?>
---EXPECT--
+--EXPECTF--
 mysqli_query(): Argument #2 ($query) cannot be empty
 array(1) {
   ["valid"]=>
@@ -126,6 +126,6 @@ array(1) {
   string(1) "a"
 }
 string(1) "a"
-mysqli_query(): Argument #3 ($result_mode) must be either MYSQLI_USE_RESULT, or MYSQLI_STORE_RESULT with MYSQLI_ASYNC as an optional bitmask flag
+mysqli_query(): Argument #3 ($result_mode) must be either MYSQLI_USE_RESULT, or MYSQLI_STORE_RESULT%S
 mysqli object is already closed
 done!

diff --git a/ext/pdo_mysql/tests/bug70389.phpt b/ext/pdo_mysql/tests/bug70389.phpt
index f2be259543b22ccd4b4ad85ecd6fd5c7bff1e0b4..7815b21255740f8443ce37201cf5cd9fffdedd76 100644 (file)
--- a/ext/pdo_mysql/tests/bug70389.phpt
+++ b/ext/pdo_mysql/tests/bug70389.phpt
@@ -22,9 +22,9 @@ new PDO(PDO_MYSQL_TEST_DSN, PDO_MYSQL_TEST_USER, PDO_MYSQL_TEST_PASS, $flags);
 var_dump($flags);
 
 ?>
---EXPECT--
+--EXPECTF--
 array(3) {
-  [1005]=>
+  [%d]=>
   bool(true)
   [1001]=>
   bool(true)