4 files changed, 12 insertions, 12 deletions
diff --git a/ext/mysqli/tests/bug34810.phpt b/ext/mysqli/tests/bug34810.phpt
index 9157a13b9a..e1568d3038 100644
--- a/ext/mysqli/tests/bug34810.phpt
+++ b/ext/mysqli/tests/bug34810.phpt
@@ -12,13 +12,14 @@ class DbConnection {
     public function connect() {
         require_once("connect.inc");
 
-        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+        /* Pass false as $connect_flags cannot be accessed via globals. */
+        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket, false);
         var_dump($link);
 
         $link = mysqli_init();
         var_dump($link);
 
-        $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
+        $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket, false);
         $mysql->query("DROP TABLE IF EXISTS test_warnings");
         $mysql->query("CREATE TABLE test_warnings (a int not null)");
         $mysql->query("SET sql_mode=''");
diff --git a/ext/mysqli/tests/bug62885.phpt b/ext/mysqli/tests/bug62885.phpt
index 4d02475570..c0815c7f04 100644
--- a/ext/mysqli/tests/bug62885.phpt
+++ b/ext/mysqli/tests/bug62885.phpt
@@ -12,11 +12,11 @@ if (!$IS_MYSQLND) {
 <?php
 error_reporting(E_ALL);
 $tablica = array();
-$test1 = mysqli_poll($test2, $test3, $tablica, null);
+$test1 = mysqli_poll($test2, $test3, $tablica, 0);
 
 $test2 = array();
 $test2 = array();
-$test1 = mysqli_poll($test2, $test3, $tablica, null);
+$test1 = mysqli_poll($test2, $test3, $tablica, 0);
 echo "okey";
 ?>
 --EXPECTF--
diff --git a/ext/mysqli/tests/mysqli_kill.phpt b/ext/mysqli/tests/mysqli_kill.phpt
index bec08cc1e1..d2c0fc6df6 100644
--- a/ext/mysqli/tests/mysqli_kill.phpt
+++ b/ext/mysqli/tests/mysqli_kill.phpt
@@ -11,9 +11,8 @@ require_once('skipifconnectfailure.inc');
 
     require('table.inc');
 
-    // Zend will cast the NULL to 0
     try {
-        mysqli_kill($link, null);
+        mysqli_kill($link, 0);
     } catch (\ValueError $e) {
         echo $e->getMessage() . \PHP_EOL;
     }
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt
index f2428aeb92..9a0e52d5cb 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt
@@ -35,12 +35,12 @@ if (!function_exists('mysqli_stmt_get_result'))
             printf("[004] It is very unlikely that SHOW ENGINES returns no data, check manually\n");
         } else {
             $found = false;
-            foreach ($engines as $k => $engine)
-                foreach ($engine as $k => $v)
-                    if (stristr($v, 'MyISAM')) {
-                        $found = true;
-                        break;
-                    }
+            foreach ($engines as $engine) {
+                if (stristr($engine[0], 'MyISAM')) {
+                    $found = true;
+                    break;
+                }
+            }
             if (!$found)
                 printf("[005] It is very unlikely that SHOW ENGINES does not show MyISAM, check manually\n");
         }