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

[uwendel]

Author: uwendel
Date: 2007-06-27 12:40:39 +0200 (Wed, 27 Jun 2007)
New Revision: 513

Modified:
   trunk/tests/ext/mysqli/mysqli_set_charset.phpt
Log:
Changing call order.


Modified: trunk/tests/ext/mysqli/mysqli_set_charset.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_set_charset.phpt	2007-06-27 08:57:57 UTC (rev 512)
+++ trunk/tests/ext/mysqli/mysqli_set_charset.phpt	2007-06-27 10:40:39 UTC (rev 513)
@@ -73,16 +73,17 @@
     if (!$res = mysqli_query($link, "SHOW CHARACTER SET"))
         printf("[016] Cannot get list of character sets\n");
         
-    while ($tmp = mysqli_fetch_assoc($res)) {
-        /* Uncomment to see where it hangs - var_dump($tmp); flush(); */
-        if (!mysqli_query($link, sprintf("SET NAMES %s", mysqli_real_escape_string($link,
$tmp['Charset']))))
-            printf("[017] Cannot run SET NAMES %s, [%d] %s\n", $tmp['Charset'],
mysqli_errno($link), mysqli_error($link));
+    while ($tmp = mysqli_fetch_assoc($res)) {      
             
         /* Uncomment to see where it hangs - var_dump($tmp); flush(); */
         if (!mysqli_set_charset($link, $tmp['Charset'])) {
-            printf("[018] Cannot set character set to '%s', [%d] %s\n", $tmp['Charset'],
+            printf("[017] Cannot set character set to '%s', [%d] %s\n", $tmp['Charset'],
                 mysqli_errno($link), mysqli_error($link));
-        }                
+        }
+        
+        /* Uncomment to see where it hangs - var_dump($tmp); flush(); */
+        if (!mysqli_query($link, sprintf("SET NAMES %s", mysqli_real_escape_string($link,
$tmp['Charset']))))
+            printf("[018] Cannot run SET NAMES %s, [%d] %s\n", $tmp['Charset'],
mysqli_errno($link), mysqli_error($link));
     }            
     mysqli_free_result($res);