Fix tests

diff --git a/ext/mysqli/tests/061.phpt b/ext/mysqli/tests/061.phpt
index c7a217f2746940de7a7e5fa4f9fce49f4c115fc8..813fc052655e6a8739d193917577a95ec277d0be 100644 (file)
--- a/ext/mysqli/tests/061.phpt
+++ b/ext/mysqli/tests/061.phpt
@@ -12,8 +12,10 @@ local infile handler
                return(strlen($buffer));
        }
        
-       /*** test mysqli_connect 127.0.0.1 ***/
-       $link = mysqli_connect($host, $user, $passwd, "test");
+       /*** test mysqli_real_connect 127.0.0.1 ***/
+       $link = mysqli_init();
+       mysqli_options($link, MYSQLI_OPT_LOCAL_INFILE, 1);
+       mysqli_real_connect($link, $host, $user, $passwd, "test");
 
        /* create temporary file */
        $filename = dirname(__FILE__) . "061.csv";

diff --git a/ext/mysqli/tests/065.phpt b/ext/mysqli/tests/065.phpt
index 09ee886ec5701ed616dd7d6367a2554eb8cbd963..f8cec7005f5df1e53fdc9e50d4d0058702e359ba 100644 (file)
--- a/ext/mysqli/tests/065.phpt
+++ b/ext/mysqli/tests/065.phpt
@@ -6,6 +6,9 @@ require_once('skipif.inc');
 if (!function_exists('mysqli_set_charset')) {
        die('skip mysqli_set_charset() not available');
 }
+if (!mysqli_set_charset($con, "gbh") && mysqli_errno($con) == 2019) {
+    die('skip mysql compiled without gbh charset support');
+}
 ?>
 --FILE--
 <?php

diff --git a/ext/mysqli/tests/skipif.inc b/ext/mysqli/tests/skipif.inc
index f471b5e126aed9f658de6e345ffa3ed7b83fce80..38c438738c7f4d0240215e9c2cd346739c138c57 100644 (file)
--- a/ext/mysqli/tests/skipif.inc
+++ b/ext/mysqli/tests/skipif.inc
@@ -4,7 +4,7 @@ if (!extension_loaded('mysqli')){
 }
 include "connect.inc";
 $driver = new mysqli_driver();
-if (!$driver->embedded && !@mysqli_connect($host, $user, $passwd, "", 3306)) {
+if (!$driver->embedded && !($con = @mysqli_connect($host, $user, $passwd, "", 3306))) {
        die('skip could not connect to MySQL');
 }
 ?>