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

[uwendel]

Author: uwendel
Date: 2007-03-20 16:11:45 +0100 (Tue, 20 Mar 2007)
New Revision: 213

Modified:
   trunk/ext/mysqli/tests/067.phpt
Log:
Portability: we should check the server version as well for skipping


Modified: trunk/ext/mysqli/tests/067.phpt
===================================================================
--- trunk/ext/mysqli/tests/067.phpt	2007-03-20 15:09:43 UTC (rev 212)
+++ trunk/ext/mysqli/tests/067.phpt	2007-03-20 15:11:45 UTC (rev 213)
@@ -3,10 +3,15 @@
 --SKIPIF--
 <?php 
 	require_once('skipif.inc'); 
+	include "connect.inc";
+	if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+      die("skip Cannot connect to check required version");
 	/* skip cursor test for versions < 50004 */
-	if (mysqli_get_client_version() < 50009) {
-		die("skip Client library doesn't support cursors");	
+	if ((mysqli_get_client_version() < 50009) || 
+	     (mysqli_get_server_version($link) < 50009)) {
+		  die("skip Client library doesn't support cursors");	
 	}
+	mysqli_close($link);
 ?>
 --FILE--
 <?php
@@ -17,7 +22,7 @@
 		return $stmt;
 	}
 
-	include "connect.inc";
+	include "connect.inc";	
 	$a = array();
 	
 	/*** test mysqli_connect 127.0.0.1 ***/