Remove unnecessary skip checks (#13637)

ext/mysqli/tests/bug46614.phpt

@@ -5,9 +5,6 @@ mysqli
 --SKIPIF--
 <?php
 require_once 'skipifconnectfailure.inc';
-if (!defined("MYSQLI_ASYNC")) {
-    die("skip mysqlnd only");
-}
 ?>
 --FILE--
 <?php

ext/mysqli/tests/bug47050.phpt

@@ -5,9 +5,6 @@ mysqli
 --SKIPIF--
 <?php
 require_once 'skipifconnectfailure.inc';
-if (!defined("MYSQLI_ASYNC")) {
-    die("skip mysqlnd only");
-}
 ?>
 --FILE--
 <?php

ext/mysqli/tests/bug73800.phpt

@@ -6,7 +6,6 @@ mysqli
 <?php
 require_once 'skipifconnectfailure.inc';
 if (PHP_INT_SIZE != 8) die('skip requires 64-bit');
-if (!defined('MYSQLI_OPT_INT_AND_FLOAT_NATIVE')) die('skip requires mysqlnd');
 ?>
 --FILE--
 <?php

ext/mysqli/tests/bug77597.phpt

@@ -5,7 +5,6 @@ mysqli
 --SKIPIF--
 <?php
 require_once 'skipifconnectfailure.inc';
-if (!defined('MYSQLI_STORE_RESULT_COPY_DATA')) die('skip requires mysqlnd');
 ?>
 --FILE--
 <?php

ext/mysqli/tests/bug79375.phpt

@@ -6,7 +6,6 @@ mysqli
 <?php
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 require_once 'skipifconnectfailure.inc';
-if (!defined('MYSQLI_STORE_RESULT_COPY_DATA')) die('skip requires mysqlnd');
 ?>
 --FILE--
 <?php

ext/mysqli/tests/bug80837.phpt

@@ -5,7 +5,6 @@ mysqli
 --SKIPIF--
 <?php
 require_once 'skipifconnectfailure.inc';
-if (!defined('MYSQLI_STORE_RESULT_COPY_DATA')) die('skip requires mysqlnd');
 ?>
 --FILE--
 <?php

ext/mysqli/tests/deprecated_constants.phpt

@@ -9,13 +9,8 @@ echo constant('MYSQLI_NO_DATA')."\n";
 echo constant('MYSQLI_DATA_TRUNCATED')."\n";
 echo constant('MYSQLI_SERVER_QUERY_NO_GOOD_INDEX_USED')."\n";
 echo constant('MYSQLI_SERVER_QUERY_NO_INDEX_USED')."\n";
-if (stristr(mysqli_get_client_info(), 'mysqlnd')) {
+echo constant('MYSQLI_SERVER_QUERY_WAS_SLOW')."\n";
-    echo constant('MYSQLI_SERVER_QUERY_WAS_SLOW')."\n";
+echo constant('MYSQLI_SERVER_PS_OUT_PARAMS')."\n";
-    echo constant('MYSQLI_SERVER_PS_OUT_PARAMS')."\n";
-} else {
-    print("\nDeprecated: Constant MYSQLI_SERVER_QUERY_WAS_SLOW is deprecated in dummy\n-1\n");
-    print("\nDeprecated: Constant MYSQLI_SERVER_PS_OUT_PARAMS is deprecated in dummy\n-1\n");
-}
 echo constant('MYSQLI_IS_MARIADB')."\n";
 
 ?>

ext/mysqli/tests/mysqli_explain_metadata.phpt

@@ -95,8 +95,7 @@ require_once 'skipifconnectfailure.inc';
             var_dump($fields);
         }
 
-        if (function_exists('mysqli_stmt_get_result') &&
+        if ($stmt->prepare('EXPLAIN SELECT t1.*, t2.* FROM test AS t1, test AS t2') &&
-            $stmt->prepare('EXPLAIN SELECT t1.*, t2.* FROM test AS t1, test AS t2') &&
             $stmt->execute()) {
             if (!$res_stmt = mysqli_stmt_get_result($stmt)) {
                 printf("[017] Cannot fetch result from PS [%d] %s\n",

ext/mysqli/tests/mysqli_get_client_stats.phpt

@@ -5,9 +5,6 @@ mysqli
 --SKIPIF--
 <?PHP
 require_once 'skipifconnectfailure.inc';
-if (!function_exists('mysqli_get_client_stats')) {
-    die("skip only available with mysqlnd");
-}
 ?>
 --INI--
 mysqlnd.collect_statistics=1

ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt

@@ -5,9 +5,6 @@ mysqli
 --SKIPIF--
 <?PHP
 require_once 'skipifconnectfailure.inc';
-if (!function_exists('mysqli_get_client_stats')) {
-    die("skip only available with mysqlnd");
-}
 ?>
 --INI--
 mysqlnd.collect_statistics=1

ext/mysqli/tests/mysqli_get_client_stats_off.phpt

@@ -5,9 +5,6 @@ mysqli
 --SKIPIF--
 <?PHP
 require_once 'skipifconnectfailure.inc';
-if (!function_exists('mysqli_get_client_stats')) {
-    die("skip only available with mysqlnd");
-}
 ?>
 --INI--
 mysqlnd.collect_statistics=0

ext/mysqli/tests/mysqli_get_client_stats_ps.phpt

@@ -5,9 +5,6 @@ mysqli
 --SKIPIF--
 <?PHP
 require_once 'skipifconnectfailure.inc';
-if (!function_exists('mysqli_get_client_stats')) {
-    die("skip only available with mysqlnd");
-}
 ?>
 --INI--
 mysqlnd.collect_statistics=1

ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt

@@ -8,9 +8,6 @@ mysqli
 --SKIPIF--
 <?PHP
 require_once 'skipifconnectfailure.inc';
-if (!function_exists('mysqli_get_client_stats')) {
-    die("skip only available with mysqlnd");
-}
 ?>
 --FILE--
 <?php

ext/mysqli/tests/mysqli_get_connection_stats.phpt

@@ -8,9 +8,6 @@ mysqli
 --SKIPIF--
 <?PHP
 require_once 'skipifconnectfailure.inc';
-if (!function_exists('mysqli_get_connection_stats')) {
-    die("skip only available with mysqlnd");
-}
 ?>
 --FILE--
 <?php

ext/mysqli/tests/mysqli_get_connection_stats_off.phpt

@@ -8,9 +8,6 @@ mysqli
 --SKIPIF--
 <?PHP
 require_once 'skipifconnectfailure.inc';
-if (!function_exists('mysqli_get_connection_stats')) {
-    die("skip only available with mysqlnd");
-}
 ?>
 --FILE--
 <?php

ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt

@@ -63,8 +63,6 @@ if (mysqli_get_server_version($link) <= 50000) {
     }
 
 
-    if (function_exists('mysqli_stmt_get_result')) {
-
     if (!mysqli_query($link, 'DROP PROCEDURE IF EXISTS p'))
         printf("[019] [%d] %s.\n", mysqli_errno($link), mysqli_error($link));
 
@@ -100,8 +98,6 @@ if (mysqli_get_server_version($link) <= 50000) {
         printf("[027] Cannot create SP, [%d] %s.\n", mysqli_errno($link), mysqli_error($link));
     }
 
-    }
-
     if (!mysqli_query($link, 'DROP PROCEDURE IF EXISTS p'))
         printf("[028] [%d] %s.\n", mysqli_errno($link), mysqli_error($link));
 

ext/mysqli/tests/mysqli_stmt_get_result.phpt

@@ -5,9 +5,6 @@ mysqli
 --SKIPIF--
 <?php
 require_once 'skipifconnectfailure.inc';
-
-if (!function_exists('mysqli_stmt_get_result'))
-    die('skip mysqli_stmt_get_result not available');
 ?>
 --FILE--
 <?php

ext/mysqli/tests/mysqli_stmt_get_result2.phpt

@@ -5,8 +5,6 @@ mysqli
 --SKIPIF--
 <?php
 require_once 'skipifconnectfailure.inc';
-if (!function_exists('mysqli_stmt_get_result'))
-    die('skip mysqli_stmt_get_result not available');
 ?>
 --FILE--
 <?php

ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt

@@ -4,10 +4,6 @@ Fetching BIT column values using the PS API
 mysqli
 --SKIPIF--
 <?php
-if (!function_exists('mysqli_stmt_get_result')) {
-    die("skip mysqli_stmt_get_result() not available");
-}
-
 require_once 'connect.inc';
 if (!$link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
     die(sprintf("skip Can't connect to MySQL Server - [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));

ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt

@@ -5,9 +5,6 @@ mysqli
 --SKIPIF--
 <?php
     require_once 'skipifconnectfailure.inc';
-
-    if (!function_exists('mysqli_stmt_get_result'))
-        die('skip mysqli_stmt_get_result not available');
 ?>
 --FILE--
 <?php

ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt

@@ -6,9 +6,6 @@ mysqli
 <?php
     require_once 'skipifconnectfailure.inc';
 
-    if (!function_exists('mysqli_stmt_get_result'))
-        die("skip mysqli_stmt_get_result() not available");
-
     if (!defined("MYSQLI_TYPE_GEOMETRY"))
         die("skip MYSQLI_TYPE_GEOMETRY not defined");
 ?>

ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt

@@ -5,9 +5,6 @@ mysqli
 --SKIPIF--
 <?php
 require_once 'skipifconnectfailure.inc';
-
-if (!function_exists('mysqli_stmt_get_result'))
-    die('skip mysqli_stmt_get_result not available');
 ?>
 --FILE--
 <?php

ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt

@@ -5,9 +5,6 @@ mysqli
 --SKIPIF--
 <?php
 require_once 'skipifconnectfailure.inc';
-
-if (!function_exists('mysqli_stmt_get_result'))
-    die('skip mysqli_stmt_get_result not available');
 ?>
 --FILE--
 <?php

ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt

@@ -5,9 +5,6 @@ mysqli
 --SKIPIF--
 <?php
 require_once 'skipifconnectfailure.inc';
-
-if (!function_exists('mysqli_stmt_get_result'))
-    die('skip mysqli_stmt_get_result not available');
 ?>
 --FILE--
 <?php

ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt

@@ -5,9 +5,6 @@ mysqli
 --SKIPIF--
 <?php
 require_once 'skipifconnectfailure.inc';
-
-if (!function_exists('mysqli_stmt_get_result'))
-    die('skip mysqli_stmt_get_result not available');
 ?>
 --FILE--
 <?php

ext/mysqli/tests/mysqli_stmt_get_result_types.phpt

@@ -5,9 +5,6 @@ mysqli
 --SKIPIF--
 <?php
     require_once 'skipifconnectfailure.inc';
-
-    if (!function_exists('mysqli_stmt_get_result'))
-        die("skip mysqli_stmt_get_result() not available");
 ?>
 --FILE--
 <?php

ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt

@@ -83,8 +83,6 @@ die("skip Check again when the Klingons visit earth - http://bugs.mysql.com/bug.
             }
         }
 
-        if (function_exists('mysqli_stmt_get_result')) {
-            /* mysqlnd only */
         if (!mysqli_stmt_execute($stmt)) {
             printf("[%04d - %s] [%d] %s\n",
                 $offset + 6, $sql,
@@ -163,8 +161,6 @@ die("skip Check again when the Klingons visit earth - http://bugs.mysql.com/bug.
             var_dump($meta);
         }
 
-        }
-
         mysqli_stmt_close($stmt);
         return true;
     }

ext/mysqli/tests/mysqli_store_result_buffered_c.phpt

@@ -5,9 +5,6 @@ mysqli
 --SKIPIF--
 <?php
 require_once 'skipifconnectfailure.inc';
-if (!defined('MYSQLI_STORE_RESULT_COPY_DATA')) {
-    die("skip Requires MYSQLI_STORE_RESULT_COPY_DATA");
-}
 ?>
 --FILE--
 <?php