andrey Wed, 14 Dec 2011 16:27:52 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=321016
Log:
fix test
Changed paths:
U
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_types.phpt
U
php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_fetch_field_types.phpt
U php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_types.phpt
Modified:
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_types.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_types.phpt
2011-12-14 16:14:59 UTC (rev 321015)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_field_types.phpt
2011-12-14 16:27:52 UTC (rev 321016)
@@ -10,14 +10,14 @@
<?php
require('table.inc');
- function mysqli_field_datatypes($link, $sql_type, $php_value,
$php_type, $datatypes) {
+ function mysqli_field_datatypes($link, $sql_type, $php_value,
$php_type, $datatypes, $default_charset="latin1") {
if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) {
printf("[001] %s, [%d] %s\n", $sql_type,
mysqli_errno($link), mysqli_error($link));
return false;
}
- $create = sprintf("CREATE TABLE test(id %s)", $sql_type);
+ $create = sprintf("CREATE TABLE test(id %s) DEFAULT CHARSET
%s", $sql_type, $default_charset);
if (!mysqli_query($link, $create)) {
printf("[002] '%s' - '%s', [%d] %s\n", $sql_type,
$create,
mysqli_errno($link), mysqli_error($link));
Modified:
php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_fetch_field_types.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_fetch_field_types.phpt
2011-12-14 16:14:59 UTC (rev 321015)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_fetch_field_types.phpt
2011-12-14 16:27:52 UTC (rev 321016)
@@ -10,14 +10,14 @@
<?php
require('table.inc');
- function mysqli_field_datatypes($link, $sql_type, $php_value,
$php_type, $datatypes) {
+ function mysqli_field_datatypes($link, $sql_type, $php_value,
$php_type, $datatypes, $default_charset="latin1") {
if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) {
printf("[001] %s, [%d] %s\n", $sql_type,
mysqli_errno($link), mysqli_error($link));
return false;
}
- $create = sprintf("CREATE TABLE test(id %s)", $sql_type);
+ $create = sprintf("CREATE TABLE test(id %s) DEFAULT CHARSET
%s", $sql_type, $default_charset);
if (!mysqli_query($link, $create)) {
printf("[002] '%s' - '%s', [%d] %s\n", $sql_type,
$create,
mysqli_errno($link), mysqli_error($link));
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_types.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_types.phpt
2011-12-14 16:14:59 UTC (rev 321015)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_field_types.phpt
2011-12-14 16:27:52 UTC (rev 321016)
@@ -10,14 +10,14 @@
<?php
require('table.inc');
- function mysqli_field_datatypes($link, $sql_type, $php_value,
$php_type, $datatypes) {
+ function mysqli_field_datatypes($link, $sql_type, $php_value,
$php_type, $datatypes, $default_charset="latin1") {
if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) {
printf("[001] %s, [%d] %s\n", $sql_type,
mysqli_errno($link), mysqli_error($link));
return false;
}
- $create = sprintf("CREATE TABLE test(id %s)", $sql_type);
+ $create = sprintf("CREATE TABLE test(id %s) DEFAULT CHARSET
%s", $sql_type, $default_charset);
if (!mysqli_query($link, $create)) {
printf("[002] '%s' - '%s', [%d] %s\n", $sql_type,
$create,
mysqli_errno($link), mysqli_error($link));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
