uw Wed, 04 Nov 2009 16:56:32 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=290210
Log:
mysqli won't accept empty string for socket, skip test of mysqli.default_socket
if test run does not use socket
Changed paths:
U
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
U php/php-src/trunk/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
Modified:
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
===================================================================
---
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
2009-11-04 16:30:50 UTC (rev 290209)
+++
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
2009-11-04 16:56:32 UTC (rev 290210)
@@ -9,7 +9,11 @@
$tmp = NULL;
$link = NULL;
- ini_set('mysqli.default_socket', 'socket');
+
+ if ($socket != "")
+ /* mysqli.default_socket requires non-empty string */
+ ini_set('mysqli.default_socket', 'socket');
+
ini_set('mysqli.default_port', 9999);
ini_set('mysqli.default_pw', 'password');
ini_set('mysqli.default_user', 'user');
@@ -18,21 +22,23 @@
mysqli_report(MYSQLI_REPORT_OFF);
mysqli_report(MYSQLI_REPORT_STRICT);
- ini_set('mysqli.default_socket', $socket);
- try {
- $mysqli = mysqli_init();
- $mysqli->real_connect($host, $user, $passwd, $db, $port);
+ if ($socket != "") {
+ ini_set('mysqli.default_socket', $socket);
+ try {
+ $mysqli = mysqli_init();
+ $mysqli->real_connect($host, $user, $passwd, $db,
$port);
- if (!$res = $mysqli->query("SELECT 'mysqli.default_socket' AS
testing"))
- printf("[001] [%d] %s\n", $mysqli->errno,
$mysqli->error);
- var_dump($res->fetch_assoc());
- $res->free_result();
+ if (!$res = $mysqli->query("SELECT
'mysqli.default_socket' AS testing"))
+ printf("[001] [%d] %s\n", $mysqli->errno,
$mysqli->error);
+ var_dump($res->fetch_assoc());
+ $res->free_result();
- $mysqli->close();
+ $mysqli->close();
- } catch (mysqli_sql_exception $e) {
- printf("%s\n", $e->getMessage());
- printf("[002] Usage of mysqli.default_socket failed\n");
+ } catch (mysqli_sql_exception $e) {
+ printf("%s\n", $e->getMessage());
+ printf("[002] Usage of mysqli.default_socket failed\n");
+ }
}
ini_set('mysqli.default_port', $port);
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
2009-11-04 16:30:50 UTC (rev 290209)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
2009-11-04 16:56:32 UTC (rev 290210)
@@ -9,7 +9,11 @@
$tmp = NULL;
$link = NULL;
- ini_set('mysqli.default_socket', 'socket');
+
+ if ($socket != "")
+ /* mysqli.default_socket requires non-empty string */
+ ini_set('mysqli.default_socket', 'socket');
+
ini_set('mysqli.default_port', 9999);
ini_set('mysqli.default_pw', 'password');
ini_set('mysqli.default_user', 'user');
@@ -18,21 +22,23 @@
mysqli_report(MYSQLI_REPORT_OFF);
mysqli_report(MYSQLI_REPORT_STRICT);
- ini_set('mysqli.default_socket', $socket);
- try {
- $mysqli = mysqli_init();
- $mysqli->real_connect($host, $user, $passwd, $db, $port);
+ if ($socket != "") {
+ ini_set('mysqli.default_socket', $socket);
+ try {
+ $mysqli = mysqli_init();
+ $mysqli->real_connect($host, $user, $passwd, $db,
$port);
- if (!$res = $mysqli->query("SELECT 'mysqli.default_socket' AS
testing"))
- printf("[001] [%d] %s\n", $mysqli->errno,
$mysqli->error);
- var_dump($res->fetch_assoc());
- $res->free_result();
+ if (!$res = $mysqli->query("SELECT
'mysqli.default_socket' AS testing"))
+ printf("[001] [%d] %s\n", $mysqli->errno,
$mysqli->error);
+ var_dump($res->fetch_assoc());
+ $res->free_result();
- $mysqli->close();
+ $mysqli->close();
- } catch (mysqli_sql_exception $e) {
- printf("%s\n", $e->getMessage());
- printf("[002] Usage of mysqli.default_socket failed\n");
+ } catch (mysqli_sql_exception $e) {
+ printf("%s\n", $e->getMessage());
+ printf("[002] Usage of mysqli.default_socket failed\n");
+ }
}
ini_set('mysqli.default_port', $port);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
