Fix two tests

diff --git a/ext/mysqli/tests/mysqli_error_unicode.phpt b/ext/mysqli/tests/mysqli_error_unicode.phpt
index 46bfc886ab4794bb050b5ed3a9c7936012c5c6c5..e6b5585a38cef83c2633240f2ef7d42c83244113 100644 (file)
--- a/ext/mysqli/tests/mysqli_error_unicode.phpt
+++ b/ext/mysqli/tests/mysqli_error_unicode.phpt
@@ -24,6 +24,8 @@ require_once('skipifconnectfailure.inc');
                        $host, $user, $db, $port, $socket);
        }
 
+       mysqli_query($link, "set names utf8");
+
        $tmp = mysqli_error($link);
        if (!is_string($tmp) || ('' !== $tmp))
                printf("[004] Expecting string/empty, got %s/%s. [%d] %s\n", gettype($tmp), $tmp, mysqli_errno($link), mysqli_error($link));

diff --git a/ext/mysqli/tests/mysqli_get_client_stats.phpt b/ext/mysqli/tests/mysqli_get_client_stats.phpt
index c61ae81ed41fc5063002880b19c6f4846fa8ab01..6ebcf3ef06a378d69aa7d3716a653b78360e5caa 100644 (file)
--- a/ext/mysqli/tests/mysqli_get_client_stats.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats.phpt
@@ -119,6 +119,7 @@ mysqlnd.collect_memory_statistics=1
        mysqli_get_client_stats_assert_eq('result_set_queries', $new_info, $info, $test_counter);
 
        /* we need to skip this test in unicode - we send set names utf8 during mysql_connect */
+       mysqli_get_client_stats_assert_eq('non_result_set_queries', $new_info, $info, $test_counter);
        mysqli_get_client_stats_assert_eq('buffered_sets', $new_info, $info, $test_counter);
        mysqli_get_client_stats_assert_eq('unbuffered_sets', $new_info, $info, $test_counter);
        mysqli_get_client_stats_assert_eq('ps_buffered_sets', $new_info, $info, $test_counter);