svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/tests/connect.inc branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field.phpt
branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_oo.phpt branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_fields.phpt
branches/PHP_5_3/ext/mysqli/tests/mysqli_field_seek.phpt branches/PHP_5_3/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt
trunk/ext/mysqli/tests/connect.inc trunk/ext/mysqli/tests/mysqli_fetch_field.phpt trunk/ext/mysqli/tests/mysqli_fetch

andrey Wed, 22 Sep 2010 18:25:33 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=303689 Log: Unify, force one charset at connect, thus fixing test failures because different servers have different system charsets. Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqli/tests/connect.inc U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_oo.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_fields.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_field_seek.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt U php/php-src/trunk/ext/mysqli/tests/connect.inc U php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_oo.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_fields.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_field_seek.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/connect.inc =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/connect.inc 2010-09-22 17:11:42 UTC (rev 303688) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/connect.inc 2010-09-22 18:25:33 UTC (rev 303689) @@ -90,10 +90,12 @@ if ($flags !== false) { $link = mysqli_init(); + $link->options(MYSQLI_SET_CHARSET_NAME, "utf8"); if (!mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket, $flags)) $link = false; } else { $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link->set_charset("utf8"); } return $link; Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field.phpt 2010-09-22 17:11:42 UTC (rev 303688) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field.phpt 2010-09-22 18:25:33 UTC (rev 303689) @@ -99,9 +99,9 @@ [%u|b%"max_length"]=> int(1) [%u|b%"length"]=> - int(1) + int(%d) [%u|b%"charsetnr"]=> - int(8) + int(%d) [%u|b%"flags"]=> int(0) [%u|b%"type"]=> Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_oo.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_oo.phpt 2010-09-22 17:11:42 UTC (rev 303688) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_oo.phpt 2010-09-22 18:25:33 UTC (rev 303689) @@ -87,9 +87,9 @@ [%u|b%"max_length"]=> int(1) [%u|b%"length"]=> - int(1) + int(%d) [%u|b%"charsetnr"]=> - int(8) + int(%d) [%u|b%"flags"]=> int(0) [%u|b%"type"]=> Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_fields.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_fields.phpt 2010-09-22 17:11:42 UTC (rev 303688) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_fields.phpt 2010-09-22 18:25:33 UTC (rev 303689) @@ -80,9 +80,9 @@ [%u|b%"max_length"]=> int(1) [%u|b%"length"]=> - int(1) + int(%d) [%u|b%"charsetnr"]=> - int(8) + int(%d) [%u|b%"flags"]=> int(0) [%u|b%"type"]=> Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_field_seek.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_field_seek.phpt 2010-09-22 17:11:42 UTC (rev 303688) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_field_seek.phpt 2010-09-22 18:25:33 UTC (rev 303689) @@ -172,9 +172,9 @@ [%u|b%"max_length"]=> int(0) [%u|b%"length"]=> - int(1) + int(%d) [%u|b%"charsetnr"]=> - int(8) + int(%d) [%u|b%"flags"]=> int(0) [%u|b%"type"]=> Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt 2010-09-22 17:11:42 UTC (rev 303688) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt 2010-09-22 18:25:33 UTC (rev 303689) @@ -81,9 +81,9 @@ [%u|b%"max_length"]=> int(1) [%u|b%"length"]=> - int(1) + int(%d) [%u|b%"charsetnr"]=> - int(8) + int(%d) [%u|b%"flags"]=> int(0) [%u|b%"type"]=> @@ -129,9 +129,9 @@ [%u|b%"max_length"]=> int(2) [%u|b%"length"]=> - int(2) + int(%d) [%u|b%"charsetnr"]=> - int(8) + int(%d) [%u|b%"flags"]=> int(0) [%u|b%"type"]=> Modified: php/php-src/trunk/ext/mysqli/tests/connect.inc =================================================================== --- php/php-src/trunk/ext/mysqli/tests/connect.inc 2010-09-22 17:11:42 UTC (rev 303688) +++ php/php-src/trunk/ext/mysqli/tests/connect.inc 2010-09-22 18:25:33 UTC (rev 303689) @@ -90,10 +90,12 @@ if ($flags !== false) { $link = mysqli_init(); + $link->options(MYSQLI_SET_CHARSET_NAME, "utf8"); if (!mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket, $flags)) $link = false; } else { $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link->set_charset("utf8"); } return $link; Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field.phpt 2010-09-22 17:11:42 UTC (rev 303688) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field.phpt 2010-09-22 18:25:33 UTC (rev 303689) @@ -99,9 +99,9 @@ [%u|b%"max_length"]=> int(1) [%u|b%"length"]=> - int(1) + int(%d) [%u|b%"charsetnr"]=> - int(8) + int(%d) [%u|b%"flags"]=> int(0) [%u|b%"type"]=> Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_oo.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_oo.phpt 2010-09-22 17:11:42 UTC (rev 303688) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_oo.phpt 2010-09-22 18:25:33 UTC (rev 303689) @@ -87,9 +87,9 @@ [%u|b%"max_length"]=> int(1) [%u|b%"length"]=> - int(1) + int(%d) [%u|b%"charsetnr"]=> - int(8) + int(%d) [%u|b%"flags"]=> int(0) [%u|b%"type"]=> Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_fields.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_fields.phpt 2010-09-22 17:11:42 UTC (rev 303688) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_fields.phpt 2010-09-22 18:25:33 UTC (rev 303689) @@ -80,9 +80,9 @@ [%u|b%"max_length"]=> int(1) [%u|b%"length"]=> - int(1) + int(%d) [%u|b%"charsetnr"]=> - int(8) + int(%d) [%u|b%"flags"]=> int(0) [%u|b%"type"]=> Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_field_seek.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_field_seek.phpt 2010-09-22 17:11:42 UTC (rev 303688) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_field_seek.phpt 2010-09-22 18:25:33 UTC (rev 303689) @@ -172,9 +172,9 @@ [%u|b%"max_length"]=> int(0) [%u|b%"length"]=> - int(1) + int(%d) [%u|b%"charsetnr"]=> - int(8) + int(%d) [%u|b%"flags"]=> int(0) [%u|b%"type"]=> Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt 2010-09-22 17:11:42 UTC (rev 303688) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt 2010-09-22 18:25:33 UTC (rev 303689) @@ -81,9 +81,9 @@ [%u|b%"max_length"]=> int(1) [%u|b%"length"]=> - int(1) + int(%d) [%u|b%"charsetnr"]=> - int(8) + int(%d) [%u|b%"flags"]=> int(0) [%u|b%"type"]=> @@ -129,9 +129,9 @@ [%u|b%"max_length"]=> int(2) [%u|b%"length"]=> - int(2) + int(%d) [%u|b%"charsetnr"]=> - int(8) + int(%d) [%u|b%"flags"]=> int(0) [%u|b%"type"]=>