PHP mysqlnd svn commit: r553 - trunk/tests/ext/mysqli

[uwendel]

Author: uwendel
Date: 2007-06-28 10:52:42 +0200 (Thu, 28 Jun 2007)
New Revision: 553

Modified:
   trunk/tests/ext/mysqli/mysqli_set_charset.phpt
Log:
Now it's passing with PHP 5 and PHP 6 @ libmysql but it fails with PHP 6 @ mysqlnd. The
reason is obvious why it fails, but why does it fail only with mysqlnd?



Modified: trunk/tests/ext/mysqli/mysqli_set_charset.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_charset.phpt	2007-06-28 08:36:36 UTC (rev 552)
+++ trunk/tests/ext/mysqli/mysqli_set_charset.phpt	2007-06-28 08:52:42 UTC (rev 553)
@@ -73,12 +73,15 @@
     if (!$res = mysqli_query($link, "SHOW CHARACTER SET"))
         printf("[016] Cannot get list of character sets\n");
         
-    while ($tmp = mysqli_fetch_assoc($res)) {      
+    while ($tmp = mysqli_fetch_assoc($res)) {  
+        if ('ucs2' == $tmp['Charset'])
+            continue;    
             
         /* Uncomment to see where it hangs - var_dump($tmp); flush(); */
-        if (!mysqli_set_charset($link, $tmp['Charset'])) {
+        if (!@mysqli_set_charset($link, $tmp['Charset'])) {
             printf("[017] Cannot set character set to '%s', [%d] %s\n", $tmp['Charset'],
                 mysqli_errno($link), mysqli_error($link));
+            continue;                
         }
         
         /* Uncomment to see where it hangs - var_dump($tmp); flush(); */