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

[uwendel]

Author: uwendel
Date: 2007-03-20 16:05:27 +0100 (Tue, 20 Mar 2007)
New Revision: 210

Modified:
   trunk/ext/mysqli/tests/mysqli_get_client_stats.phpt
Log:
Portability: RENAME DATABASE is only available for 5.1.x+ - 5.1.7 according to the manual


Modified: trunk/ext/mysqli/tests/mysqli_get_client_stats.phpt
===================================================================
--- trunk/ext/mysqli/tests/mysqli_get_client_stats.phpt	2007-03-20 15:04:02 UTC (rev 209)
+++ trunk/ext/mysqli/tests/mysqli_get_client_stats.phpt	2007-03-20 15:05:27 UTC (rev 210)
@@ -267,15 +267,25 @@
         mysqli_get_client_stats_assert_eq('non_result_set_queries', $new_info,
(string)($info['non_result_set_queries'] + 1), $test_counter, 'CREATE DATABASE');
         $info = $new_info;
         
-        if (!mysqli_query($link, "RENAME DATABASE mysqli_get_client_stats TO
mysqli_get_client_stats_"))
-            printf("[%03d] RENAME DATABASE failed, [%d] %s\n", ++$test_counter, 
+        if (mysqli_get_server_version($link) > 51700) {
+            if (!mysqli_query($link, "RENAME DATABASE mysqli_get_client_stats TO
mysqli_get_client_stats_"))
+                printf("[%03d] RENAME DATABASE failed, [%d] %s\n", ++$test_counter, 
+                    mysqli_errno($link), mysqli_error($link));
+        
+            if (!is_array($new_info = mysqli_get_client_stats()) || empty($new_info))
+                printf("[%03d] Expecting array/any_non_empty, got %s/%s\n", 
+                    ++$test_counter, gettype($new_info), $new_info);
+            mysqli_get_client_stats_assert_eq('non_result_set_queries', $new_info,
(string)($info['non_result_set_queries'] + 1), $test_counter, 'CREATE DATABASE');
+            $info = $new_info;
+        } else {
+          if (!mysqli_query($link, "CREATE DATABASE mysqli_get_client_stats_"))
+            printf("[%03d] CREATE DATABASE failed, [%d] %s\n", ++$test_counter, 
                 mysqli_errno($link), mysqli_error($link));
-        
-        if (!is_array($new_info = mysqli_get_client_stats()) || empty($new_info))
+          if (!is_array($new_info = mysqli_get_client_stats()) || empty($new_info))
             printf("[%03d] Expecting array/any_non_empty, got %s/%s\n", 
                 ++$test_counter, gettype($new_info), $new_info);
-        mysqli_get_client_stats_assert_eq('non_result_set_queries', $new_info,
(string)($info['non_result_set_queries'] + 1), $test_counter, 'CREATE DATABASE');
-        $info = $new_info;
+          $info = $new_info;
+        }
         
         if (!mysqli_query($link, "DROP DATABASE mysqli_get_client_stats_"))
             printf("[%03d] DROP DATABASE failed, [%d] %s\n", ++$test_counter,