cvs: php-src(PHP_5_2) /ext/mysqli/tests 061.phpt 065.phpt skipif.inc

bjori Tue Dec 12 08:09:40 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/mysqli/tests 061.phpt 065.phpt skipif.inc Log: Fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/061.phpt?r1=1.5&r2=1.5.4.1&diff_format=u Index: php-src/ext/mysqli/tests/061.phpt diff -u php-src/ext/mysqli/tests/061.phpt:1.5 php-src/ext/mysqli/tests/061.phpt:1.5.4.1 --- php-src/ext/mysqli/tests/061.phpt:1.5 Mon Jun 27 10:14:11 2005 +++ php-src/ext/mysqli/tests/061.phpt Tue Dec 12 08:09:40 2006 @@ -12,8 +12,10 @@ 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"; http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/065.phpt?r1=1.3.2.1&r2=1.3.2.1.2.1&diff_format=u Index: php-src/ext/mysqli/tests/065.phpt diff -u php-src/ext/mysqli/tests/065.phpt:1.3.2.1 php-src/ext/mysqli/tests/065.phpt:1.3.2.1.2.1 --- php-src/ext/mysqli/tests/065.phpt:1.3.2.1 Sat Oct 8 15:08:07 2005 +++ php-src/ext/mysqli/tests/065.phpt Tue Dec 12 08:09:40 2006 @@ -6,6 +6,9 @@ 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 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/skipif.inc?r1=1.5&r2=1.5.4.1&diff_format=u Index: php-src/ext/mysqli/tests/skipif.inc diff -u php-src/ext/mysqli/tests/skipif.inc:1.5 php-src/ext/mysqli/tests/skipif.inc:1.5.4.1 --- php-src/ext/mysqli/tests/skipif.inc:1.5 Wed Jun 22 13:41:43 2005 +++ php-src/ext/mysqli/tests/skipif.inc Tue Dec 12 08:09:40 2006 @@ -4,7 +4,7 @@ } 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'); } ?>