uw                                       Wed, 21 Oct 2009 18:57:45 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=289833

Log:
There subtle differences between Linux and Win. mysqlnd is a bit more verbose 
on Win... silencing to make the test pass

Changed paths:
    U   
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_array_large.phpt
    U   php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_array_large.phpt

Modified: 
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_array_large.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_array_large.phpt 
2009-10-21 18:45:26 UTC (rev 289832)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_fetch_array_large.phpt 
2009-10-21 18:57:45 UTC (rev 289833)
@@ -22,11 +22,11 @@
                $len = strlen($sql);
                assert($len < $package_size);

-               if (!mysqli_query($link, $sql)) {
+               if (!...@mysqli_query($link, $sql)) {
                        if (1153 == mysqli_errno($link) || 2006 == 
mysqli_errno($link) || stristr(mysqli_error($link), 'max_allowed_packet'))
-                               /*
-                                       myslqnd - [1153] Got a packet bigger 
than 'max_allowed_packet' bytes
-                                       libmysql -[2006] MySQL server has gone 
away
+                               /*
+                                       myslqnd - [1153] Got a packet bigger 
than 'max_allowed_packet' bytes
+                                       libmysql -[2006] MySQL server has gone 
away
                                */
                                return false;


Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_array_large.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_array_large.phpt    
2009-10-21 18:45:26 UTC (rev 289832)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_fetch_array_large.phpt    
2009-10-21 18:57:45 UTC (rev 289833)
@@ -22,11 +22,11 @@
                $len = strlen($sql);
                assert($len < $package_size);

-               if (!mysqli_query($link, $sql)) {
+               if (!...@mysqli_query($link, $sql)) {
                        if (1153 == mysqli_errno($link) || 2006 == 
mysqli_errno($link) || stristr(mysqli_error($link), 'max_allowed_packet'))
-                               /*
-                                       myslqnd - [1153] Got a packet bigger 
than 'max_allowed_packet' bytes
-                                       libmysql -[2006] MySQL server has gone 
away
+                               /*
+                                       myslqnd - [1153] Got a packet bigger 
than 'max_allowed_packet' bytes
+                                       libmysql -[2006] MySQL server has gone 
away
                                */
                                return false;


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to