uw Mon, 31 May 2010 12:55:59 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=299985
Log:
Fixing test - make sure it checks the same conditions for libmysql and mysqlnd
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_connect.phpt
U php/php-src/trunk/ext/mysqli/tests/mysqli_real_connect.phpt
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_connect.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_connect.phpt
2010-05-31 12:22:48 UTC (rev 299984)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_real_connect.phpt
2010-05-31 12:55:59 UTC (rev 299985)
@@ -136,6 +136,7 @@
}
mysqli_close($link);
+ @var_dump($link);
if ($IS_MYSQLND) {
ini_set('mysqli.default_host', 'p:' . $host);
@@ -164,8 +165,6 @@
@mysqli_close($link);
}
- @var_dump($link);
-
if (NULL !== ($tmp = mysqli_real_connect($link, $host, $user, $passwd,
$db, $port, $socket)))
printf("[026] Expecting NULL, got %s/%s\n", gettype($tmp),
$tmp);
@@ -187,7 +186,7 @@
[%u|b%"connect_errno"]=>
int(%d)
[%u|b%"connect_error"]=>
- %unicode|string%(%d) "%s
+ NULL
[%u|b%"errno"]=>
%s
[%u|b%"error"]=>
@@ -215,4 +214,4 @@
}
Warning: mysqli_real_connect(): Couldn't fetch mysqli in %s on line %d
-done!
\ No newline at end of file
+done!
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_real_connect.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_real_connect.phpt 2010-05-31
12:22:48 UTC (rev 299984)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_real_connect.phpt 2010-05-31
12:55:59 UTC (rev 299985)
@@ -136,6 +136,7 @@
}
mysqli_close($link);
+ @var_dump($link);
if ($IS_MYSQLND) {
ini_set('mysqli.default_host', 'p:' . $host);
@@ -164,8 +165,6 @@
@mysqli_close($link);
}
- @var_dump($link);
-
if (NULL !== ($tmp = mysqli_real_connect($link, $host, $user, $passwd,
$db, $port, $socket)))
printf("[026] Expecting NULL, got %s/%s\n", gettype($tmp),
$tmp);
@@ -187,7 +186,7 @@
[%u|b%"connect_errno"]=>
int(%d)
[%u|b%"connect_error"]=>
- %unicode|string%(%d) "%s
+ NULL
[%u|b%"errno"]=>
%s
[%u|b%"error"]=>
@@ -215,4 +214,4 @@
}
Warning: mysqli_real_connect(): Couldn't fetch mysqli in %s on line %d
-done!
\ No newline at end of file
+done!
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
