Fix two tests

Author: tvlooy

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));

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);