uw Wed, 23 Mar 2011 08:57:52 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=309585
Log:
Coverage for a 'silent server protocol change' from the past for which both
mysqlnd and libmysql have workarounds.
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_change_user.phpt
U php/php-src/trunk/ext/mysqli/tests/mysqli_change_user.phpt
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_change_user.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_change_user.phpt
2011-03-23 08:48:32 UTC (rev 309584)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_change_user.phpt
2011-03-23 08:57:52 UTC (rev 309585)
@@ -83,8 +83,28 @@
mysqli_close($link);
+ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port,
$socket)) {
+ printf("[022] Cannot connect to the server using host=%s,
user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+ $host, $user, $db, $port, $socket);
+ }
+
+ /* silent protocol change if no db which requires workaround in
mysqlnd/libmysql
+ (empty db = no db send with COM_CHANGE_USER) */
+ if (true !== ($tmp = mysqli_change_user($link, $user, $passwd, "")))
+ printf("[023] Expecting true, got %s/%s\n", gettype($tmp),
$tmp);
+
+ if (!$res = mysqli_query($link, 'SELECT database() AS dbname, user() AS
user'))
+ printf("[024] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
+ $tmp = mysqli_fetch_assoc($res);
+ mysqli_free_result($res);
+
+ if ($tmp['dbname'] != "")
+ printf("[025] Expecting database '', got database() '%s'\n",
$tmp['dbname']);
+
+ mysqli_close($link);
+
if (NULL !== ($tmp = @mysqli_change_user($link, $user, $passwd, $db)))
- printf("[022] Expecting NULL, got %s/%s\n", gettype($tmp),
$tmp);
+ printf("[026] Expecting NULL, got %s/%s\n", gettype($tmp),
$tmp);
print "done!";
?>
Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_change_user.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_change_user.phpt 2011-03-23
08:48:32 UTC (rev 309584)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_change_user.phpt 2011-03-23
08:57:52 UTC (rev 309585)
@@ -83,8 +83,28 @@
mysqli_close($link);
+ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port,
$socket)) {
+ printf("[022] Cannot connect to the server using host=%s,
user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+ $host, $user, $db, $port, $socket);
+ }
+
+ /* silent protocol change if no db which requires workaround in
mysqlnd/libmysql
+ (empty db = no db send with COM_CHANGE_USER) */
+ if (true !== ($tmp = mysqli_change_user($link, $user, $passwd, "")))
+ printf("[023] Expecting true, got %s/%s\n", gettype($tmp),
$tmp);
+
+ if (!$res = mysqli_query($link, 'SELECT database() AS dbname, user() AS
user'))
+ printf("[024] [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
+ $tmp = mysqli_fetch_assoc($res);
+ mysqli_free_result($res);
+
+ if ($tmp['dbname'] != "")
+ printf("[025] Expecting database '', got database() '%s'\n",
$tmp['dbname']);
+
+ mysqli_close($link);
+
if (NULL !== ($tmp = @mysqli_change_user($link, $user, $passwd, $db)))
- printf("[022] Expecting NULL, got %s/%s\n", gettype($tmp),
$tmp);
+ printf("[026] Expecting NULL, got %s/%s\n", gettype($tmp),
$tmp);
print "done!";
?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
