uw Mon, 19 Oct 2009 16:07:10 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=289751
Log: mysqlnd is a bit more verbose than libmysql - silence mysqlnd here for easier comparison of test results. Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_no_reconnect.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_no_reconnect.phpt Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_no_reconnect.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_no_reconnect.phpt 2009-10-19 15:34:50 UTC (rev 289750) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_no_reconnect.phpt 2009-10-19 16:07:10 UTC (rev 289751) @@ -78,8 +78,19 @@ mysqli_connect_errno(), mysqli_connect_error()); $thread_id_timeout = mysqli_thread_id($link); - if (!mysqli_query($link, sprintf('KILL %d', $thread_id_timeout))) - printf("[013] Cannot KILL timeout connection, [%d] %s\n", mysqli_errno($link2), mysqli_error($link2)); + if ($IS_MYSQLND) { + /* + mysqlnd is a bit more verbose than libmysql. mysqlnd should print: + Warning: mysqli_query(): MySQL server has gone away in %s on line %d + + Warning: mysqli_query(): Error reading result set's header in %d on line %d + */ + if (!...@mysqli_query($link, sprintf('KILL %d', $thread_id_timeout))) + printf("[013] Cannot KILL timeout connection, [%d] %s\n", mysqli_errno($link2), mysqli_error($link2)); + } else { + if (!mysqli_query($link, sprintf('KILL %d', $thread_id_timeout))) + printf("[013] Cannot KILL timeout connection, [%d] %s\n", mysqli_errno($link2), mysqli_error($link2)); + } // Give the server a second to really kill the other thread... sleep(1); Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_no_reconnect.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_no_reconnect.phpt 2009-10-19 15:34:50 UTC (rev 289750) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_no_reconnect.phpt 2009-10-19 16:07:10 UTC (rev 289751) @@ -78,8 +78,19 @@ mysqli_connect_errno(), mysqli_connect_error()); $thread_id_timeout = mysqli_thread_id($link); - if (!mysqli_query($link, sprintf('KILL %d', $thread_id_timeout))) - printf("[013] Cannot KILL timeout connection, [%d] %s\n", mysqli_errno($link2), mysqli_error($link2)); + if ($IS_MYSQLND) { + /* + mysqlnd is a bit more verbose than libmysql. mysqlnd should print: + Warning: mysqli_query(): MySQL server has gone away in %s on line %d + + Warning: mysqli_query(): Error reading result set's header in %d on line %d + */ + if (!...@mysqli_query($link, sprintf('KILL %d', $thread_id_timeout))) + printf("[013] Cannot KILL timeout connection, [%d] %s\n", mysqli_errno($link2), mysqli_error($link2)); + } else { + if (!mysqli_query($link, sprintf('KILL %d', $thread_id_timeout))) + printf("[013] Cannot KILL timeout connection, [%d] %s\n", mysqli_errno($link2), mysqli_error($link2)); + } // Give the server a second to really kill the other thread... sleep(1);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php