List:Commits« Previous MessageNext Message »
From:uwendel Date:July 17 2007 12:40pm
Subject:PHP mysqlnd svn commit: r774 - trunk/tests/ext/mysqli
View as plain text  
Author: uwendel
Date: 2007-07-17 14:40:56 +0200 (Tue, 17 Jul 2007)
New Revision: 774

Modified:
   trunk/tests/ext/mysqli/mysqli_fetch_array.phpt
   trunk/tests/ext/mysqli/mysqli_fetch_array_assoc.phpt
   trunk/tests/ext/mysqli/mysqli_fetch_array_many_rows.phpt
   trunk/tests/ext/mysqli/mysqli_fetch_array_oo.phpt
   trunk/tests/ext/mysqli/mysqli_fetch_assoc_no_alias.phpt
Log:
Space2Tab and re-enabling BIGINT test for mysqlnd @ all server versions, libmysql @ 5.1+


Modified: trunk/tests/ext/mysqli/mysqli_fetch_array.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_array.phpt	2007-07-17 12:36:34 UTC (rev 773)
+++ trunk/tests/ext/mysqli/mysqli_fetch_array.phpt	2007-07-17 12:40:56 UTC (rev 774)
@@ -5,292 +5,289 @@
 <?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
-    include "connect.inc";
-    $tmp    = NULL;   
-    $link   = NULL;    
-    
-    if (!is_null($tmp = @mysqli_fetch_array()))
-        printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-        
-    if (!is_null($tmp = @mysqli_fetch_array($link)))
-        printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+	include "connect.inc";
+	$tmp    = NULL;
+	$link   = NULL;
 
-    require('table.inc');    
-    if (!$res = mysqli_query($link, "SELECT * FROM test ORDER BY id LIMIT 5")) {
-        printf("[004] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-    }
-    
-    print "[005]\n";
-    var_dump(mysqli_fetch_array($res));
-    
-    print "[006]\n";
-    var_dump(mysqli_fetch_array($res, MYSQLI_NUM));
-    
-    print "[007]\n";
-    var_dump(mysqli_fetch_array($res, MYSQLI_BOTH));
-    
-    print "[008]\n";
-    var_dump(mysqli_fetch_array($res, MYSQLI_ASSOC));
+	if (!is_null($tmp = @mysqli_fetch_array()))
+		printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
 
-    print "[009]\n";
-    var_dump(mysqli_fetch_array($res));
-    
-    mysqli_free_result($res);
-    
-    if (!$res = mysqli_query($link, "SELECT 1 AS a, 2 AS a, 3 AS c, 4 AS C, NULL AS d,
true AS e")) {
-        printf("[010] Cannot run query, [%d] %s\n", mysqli_errno($link),
$mysqli_error($link));
-    }
-    print "[011]\n";
-    var_dump(mysqli_fetch_array($res, MYSQLI_BOTH));
-    
-    mysqli_free_result($res);    
-    if (!$res = mysqli_query($link, "SELECT 1 AS a, 2 AS b, 3 AS c, 4 AS C")) {
-        printf("[012] Cannot run query, [%d] %s\n",
-            mysqli_errno($link), $mysqli_error($link));
-        exit(1);
-    }
-    
-    do {
-        $illegal_mode = mt_rand(-10000, 10000);
-    } while (in_array($illegal_mode, array(MYSQLI_ASSOC, MYSQLI_NUM, MYSQLI_BOTH)));
-    // NOTE: for BC reasons with ext/mysql, ext/mysqli accepts invalid result modes.  
-    $tmp = mysqli_fetch_array($res, $illegal_mode);
-    if (false !== $tmp) 
-        printf("[013] Expecting boolean/false although, got %s/%s. [%d] %s\n", 
-            gettype($tmp), $tmp, mysqli_errno($link), mysqli_error($link));
-        
-    $tmp = mysqli_fetch_array($res, $illegal_mode);
-    if (false !== $tmp)
-        printf("[014] Expecting boolean/false, got %s/%s. [%d] %s\n", 
-            gettype($tmp), $tmp, mysqli_errno($link), mysqli_error($link));
-    
-    mysqli_free_result($res);
-    
-    function func_mysqli_fetch_array($link, $engine, $sql_type, $sql_value, $php_value,
$offset, $regexp_comparison = NULL, $binary_type = false) {
-        
-        if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) {
-            printf("[%04d] [%d] %s\n", $offset, mysqli_errno($link),
mysqli_error($link));            
-            return false;
-        }
-        
-        if (!mysqli_query($link, $sql = sprintf("CREATE TABLE test(id INT NOT NULL, label
%s, PRIMARY KEY(id)) ENGINE = %s", $sql_type, $engine))) {
-            print $sql;
-            // don't bail, engine might not support the datatype
-            return false;
-        }
-        
-        if (is_null($php_value) && !mysqli_query($link, $sql = sprintf("INSERT
INTO test(id, label) VALUES (1, NULL)"))) {
-            printf("[%04d] [%d] %s\n", $offset + 1, mysqli_errno($link),
mysqli_error($link));
-            return false;
-        } 
-        
-        if (!is_null($php_value)) {
-            if (is_int($sql_value) && !mysqli_query($link, sprintf("INSERT INTO
test(id, label) VALUES (1, '%d')", $sql_value))) {
-                printf("[%04d] [%d] %s\n", $offset + 1, mysqli_errno($link),
mysqli_error($link));
-                return false;
-            } else if (!is_int($sql_value) && !mysqli_query($link,
sprintf("INSERT INTO test(id, label) VALUES (1, '%s')", $sql_value))) {
-                printf("[%04d] [%d] %s\n", $offset + 1, mysqli_errno($link),
mysqli_error($link));
-                return false;
-            }
-        }
-        
-        if (!$res = mysqli_query($link, "SELECT id, label FROM test")) {
-            printf("[%04d] [%d] %s\n", $offset + 2, mysqli_errno($link),
mysqli_error($link));
-            return false;
-        }
-        
-        if (!$row = mysqli_fetch_array($res, MYSQLI_BOTH)) {
-            printf("[%04d] [%d] %s\n", $offset + 3, mysqli_errno($link),
mysqli_error($link));
-            return false;
-        }
-		
+	if (!is_null($tmp = @mysqli_fetch_array($link)))
+		printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
 
-		
-      	if ($regexp_comparison) {
-          	if (!preg_match($regexp_comparison, (string)$row['label']) ||
!preg_match($regexp_comparison, (string)$row[1])) {
-              	printf("[%04d] Expecting %s/%s [reg exp = %s], got %s/%s resp. %s/%s. [%d]
%s\n", $offset + 4, 
-                  gettype($php_value), $php_value, $regexp_comparison,
-                  gettype($row[1]), $row[1],
-                  gettype($row['label']), $row['label'], mysqli_errno($link),
mysqli_error($link));
-	              return false;
-           }
-           
-      	} else if ((gettype($php_value) == 'unicode') && $binary_type) {
-            // Unicode is on and we are told that the MySQL column type is a binary type.
-            // Don't expect a unicode value from the database, you'll get binary string  
          
-            if (($row['label'] != $php_value) || ($row[1] != $php_value)) {
-                printf("[%04d] Expecting %s/%s, got %s/%s resp. %s/%s. [%d] %s\n",
$offset + 5, 
-                    gettype($php_value), $php_value,
-                    gettype($row[1]), $row[1],
-                    gettype($row['label']), $row['label'], mysqli_errno($link),
mysqli_error($link));
-                return false;
-            }
-            if (gettype($row['label']) == 'unicode') {
+	require('table.inc');
+	if (!$res = mysqli_query($link, "SELECT * FROM test ORDER BY id LIMIT 5")) {
+		printf("[004] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+	}
+
+	print "[005]\n";
+	var_dump(mysqli_fetch_array($res));
+
+	print "[006]\n";
+	var_dump(mysqli_fetch_array($res, MYSQLI_NUM));
+
+	print "[007]\n";
+	var_dump(mysqli_fetch_array($res, MYSQLI_BOTH));
+
+	print "[008]\n";
+	var_dump(mysqli_fetch_array($res, MYSQLI_ASSOC));
+
+	print "[009]\n";
+	var_dump(mysqli_fetch_array($res));
+
+	mysqli_free_result($res);
+
+	if (!$res = mysqli_query($link, "SELECT 1 AS a, 2 AS a, 3 AS c, 4 AS C, NULL AS d, true
AS e")) {
+		printf("[010] Cannot run query, [%d] %s\n", mysqli_errno($link), $mysqli_error($link));
+	}
+	print "[011]\n";
+	var_dump(mysqli_fetch_array($res, MYSQLI_BOTH));
+
+	mysqli_free_result($res);
+	if (!$res = mysqli_query($link, "SELECT 1 AS a, 2 AS b, 3 AS c, 4 AS C")) {
+		printf("[012] Cannot run query, [%d] %s\n",
+			mysqli_errno($link), $mysqli_error($link));
+		exit(1);
+	}
+
+	do {
+		$illegal_mode = mt_rand(-10000, 10000);
+	} while (in_array($illegal_mode, array(MYSQLI_ASSOC, MYSQLI_NUM, MYSQLI_BOTH)));
+	// NOTE: for BC reasons with ext/mysql, ext/mysqli accepts invalid result modes.
+	$tmp = mysqli_fetch_array($res, $illegal_mode);
+	if (false !== $tmp)
+			printf("[013] Expecting boolean/false although, got %s/%s. [%d] %s\n",
+				gettype($tmp), $tmp, mysqli_errno($link), mysqli_error($link));
+
+	$tmp = mysqli_fetch_array($res, $illegal_mode);
+	if (false !== $tmp)
+		printf("[014] Expecting boolean/false, got %s/%s. [%d] %s\n",
+				gettype($tmp), $tmp, mysqli_errno($link), mysqli_error($link));
+
+	mysqli_free_result($res);
+
+	function func_mysqli_fetch_array($link, $engine, $sql_type, $sql_value, $php_value,
$offset, $regexp_comparison = NULL, $binary_type = false) {
+
+		if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) {
+			printf("[%04d] [%d] %s\n", $offset, mysqli_errno($link), mysqli_error($link));
+			return false;
+		}
+
+		if (!mysqli_query($link, $sql = sprintf("CREATE TABLE test(id INT NOT NULL, label %s,
PRIMARY KEY(id)) ENGINE = %s", $sql_type, $engine))) {
+			print $sql;
+			// don't bail, engine might not support the datatype
+			return false;
+		}
+
+		if (is_null($php_value) && !mysqli_query($link, $sql = sprintf("INSERT INTO
test(id, label) VALUES (1, NULL)"))) {
+			printf("[%04d] [%d] %s\n", $offset + 1, mysqli_errno($link), mysqli_error($link));
+			return false;
+		}
+
+		if (!is_null($php_value)) {
+			if (is_int($sql_value) && !mysqli_query($link, sprintf("INSERT INTO test(id,
label) VALUES (1, '%d')", $sql_value))) {
+				printf("[%04d] [%d] %s\n", $offset + 1, mysqli_errno($link), mysqli_error($link));
+				return false;
+			} else if (!is_int($sql_value) && !mysqli_query($link, sprintf("INSERT INTO
test(id, label) VALUES (1, '%s')", $sql_value))) {
+				printf("[%04d] [%d] %s\n", $offset + 1, mysqli_errno($link), mysqli_error($link));
+				return false;
+			}
+		}
+
+		if (!$res = mysqli_query($link, "SELECT id, label FROM test")) {
+			printf("[%04d] [%d] %s\n", $offset + 2, mysqli_errno($link), mysqli_error($link));
+			return false;
+		}
+
+		if (!$row = mysqli_fetch_array($res, MYSQLI_BOTH)) {
+			printf("[%04d] [%d] %s\n", $offset + 3, mysqli_errno($link), mysqli_error($link));
+			return false;
+		}
+
+
+
+		if ($regexp_comparison) {
+			if (!preg_match($regexp_comparison, (string)$row['label']) ||
!preg_match($regexp_comparison, (string)$row[1])) {
+				printf("[%04d] Expecting %s/%s [reg exp = %s], got %s/%s resp. %s/%s. [%d] %s\n",
$offset + 4,
+					gettype($php_value), $php_value, $regexp_comparison,
+					gettype($row[1]), $row[1],
+					gettype($row['label']), $row['label'], mysqli_errno($link), mysqli_error($link));
+				return false;
+			}
+		} else if ((gettype($php_value) == 'unicode') && $binary_type) {
+			// Unicode is on and we are told that the MySQL column type is a binary type.
+			// Don't expect a unicode value from the database, you'll get binary string
+			if (($row['label'] != $php_value) || ($row[1] != $php_value)) {
+				printf("[%04d] Expecting %s/%s, got %s/%s resp. %s/%s. [%d] %s\n", $offset + 5,
+					gettype($php_value), $php_value,
+					gettype($row[1]), $row[1],
+					gettype($row['label']), $row['label'], mysqli_errno($link), mysqli_error($link));
+				return false;
+			}
+			if (gettype($row['label']) == 'unicode') {
 				var_dump(mysqli_fetch_field_direct($res, 1), $row['label']);
-                printf("[%04d] SQL Type: '%s', binary columns are supposed to return
binary string and not unicode\n",
-                    $offset + 6, $sql_type);
-                return false;
-            }
-      	} else {      	    
-          	if (($row['label'] !== $php_value) || ($row[1] != $php_value)) {
-               	printf("[%04d] Expecting %s/%s, got %s/%s resp. %s/%s. [%d] %s\n",
$offset + 7, 
-                    gettype($php_value), $php_value,
-                    gettype($row[1]), $row[1],
-                    gettype($row['label']), $row['label'], mysqli_errno($link),
mysqli_error($link));
-                return false;
-            }       
-        }
-        return true;
-    }
-    
-    function func_mysqli_fetch_array_make_string($len) {
-                
-        $ret = '';
-        for ($i = 0; $i < $len; $i++)
-            $ret .= chr(mt_rand(65, 90));
-            
-        return $ret;            
-    }
-    
-    func_mysqli_fetch_array($link, $engine, "TINYINT", -11, "-11", 20);    
-    func_mysqli_fetch_array($link, $engine, "TINYINT", NULL, NULL, 30);
-    func_mysqli_fetch_array($link, $engine, "TINYINT UNSIGNED", 1, "1", 40);
-    func_mysqli_fetch_array($link, $engine, "TINYINT UNSIGNED", NULL, NULL, 50);
-    
-    func_mysqli_fetch_array($link, $engine, "BOOL", 1, "1", 60);    
-    func_mysqli_fetch_array($link, $engine, "BOOL", NULL, NULL, 70);    
-    func_mysqli_fetch_array($link, $engine, "BOOLEAN", 0, "0", 80);
-    func_mysqli_fetch_array($link, $engine, "BOOLEAN", NULL, NULL, 90);
-    
-    func_mysqli_fetch_array($link, $engine, "SMALLINT", -32768, "-32768", 100);
-    func_mysqli_fetch_array($link, $engine, "SMALLINT", 32767, "32767", 110);
-    func_mysqli_fetch_array($link, $engine, "SMALLINT", NULL, NULL, 120);
-    func_mysqli_fetch_array($link, $engine, "SMALLINT UNSIGNED", 65535, "65535", 130);
-    func_mysqli_fetch_array($link, $engine, "SMALLINT UNSIGNED", NULL, NULL, 140);
-    
-    func_mysqli_fetch_array($link, $engine, "MEDIUMINT", -8388608, "-8388608", 150);
-    func_mysqli_fetch_array($link, $engine, "MEDIUMINT", 8388607, "8388607", 160);
-    func_mysqli_fetch_array($link, $engine, "MEDIUMINT", NULL, NULL, 170);    
-    func_mysqli_fetch_array($link, $engine, "MEDIUMINT UNSIGNED", 16777215, "16777215",
180);
-    func_mysqli_fetch_array($link, $engine, "MEDIUMINT UNSIGNED", NULL, NULL, 190);
-    
-    func_mysqli_fetch_array($link, $engine, "INTEGER", -2147483648, "-2147483648", 200);
-    func_mysqli_fetch_array($link, $engine, "INTEGER", 2147483647, "2147483647", 210);
-    func_mysqli_fetch_array($link, $engine, "INTEGER", NULL, NULL, 220);
-    func_mysqli_fetch_array($link, $engine, "INTEGER UNSIGNED", 4294967295, "4294967295",
230);
-    func_mysqli_fetch_array($link, $engine, "INTEGER UNSIGNED", NULL, NULL, 240);    
-    
-    /*
-    TODO - test case is buggy, because it depends on the MySQL server version
-    func_mysqli_fetch_array($link, $engine, "BIGINT", -9223372036854775808,
"-9223372036854775808", 250);
-    func_mysqli_fetch_array($link, $engine, "BIGINT", NULL, NULL, 260);
-    func_mysqli_fetch_array($link, $engine, "BIGINT UNSIGNED", 18446744073709551615,
"18446744073709551615", 260);
-    func_mysqli_fetch_array($link, $engine, "BIGINT UNSIGNED", NULL, NULL, 280);
-    */ 
-    
-    func_mysqli_fetch_array($link, $engine, "FLOAT", -9223372036854775808 - 1.1,
"-9.22337e+18", 290, "/-9\.22337e\+[0]?18/iu");
-    func_mysqli_fetch_array($link, $engine, "FLOAT", NULL, NULL, 300);
-    func_mysqli_fetch_array($link, $engine, "FLOAT UNSIGNED", 18446744073709551615 + 1.1,
"1.84467e+19", 310, "/1\.84467e\+[0]?19/iu");
-    func_mysqli_fetch_array($link, $engine, "FLOAT UNSIGNED ", NULL, NULL, 320);
-    
-    func_mysqli_fetch_array($link, $engine, "DOUBLE(10,2)", -99999999.99, "-99999999.99",
330);
-    func_mysqli_fetch_array($link, $engine, "DOUBLE(10,2)", NULL, NULL, 340);
-    func_mysqli_fetch_array($link, $engine, "DOUBLE(10,2) UNSIGNED", 99999999.99,
"99999999.99", 350);
-    func_mysqli_fetch_array($link, $engine, "DOUBLE(10,2) UNSIGNED", NULL, NULL, 360);
-    
-    func_mysqli_fetch_array($link, $engine, "DECIMAL(10,2)", -99999999.99,
"-99999999.99", 370);
-    func_mysqli_fetch_array($link, $engine, "DECIMAL(10,2)", NULL, NULL, 380);
-    func_mysqli_fetch_array($link, $engine, "DECIMAL(10,2)", 99999999.99, "99999999.99",
390);
-    func_mysqli_fetch_array($link, $engine, "DECIMAL(10,2)", NULL, NULL, 400);
-    
-    // don't care about date() strict TZ warnings...
+				printf("[%04d] SQL Type: '%s', binary columns are supposed to return binary string
and not unicode\n",
+					$offset + 6, $sql_type);
+				return false;
+			}
+		} else {
+			if (($row['label'] !== $php_value) || ($row[1] != $php_value)) {
+				printf("[%04d] Expecting %s/%s, got %s/%s resp. %s/%s. [%d] %s\n", $offset + 7,
+					gettype($php_value), $php_value,
+					gettype($row[1]), $row[1],
+					gettype($row['label']), $row['label'], mysqli_errno($link), mysqli_error($link));
+				return false;
+			}
+		}
+		return true;
+	}
+
+	function func_mysqli_fetch_array_make_string($len) {
+
+		$ret = '';
+		for ($i = 0; $i < $len; $i++)
+				$ret .= chr(mt_rand(65, 90));
+
+		return $ret;
+	}
+
+	func_mysqli_fetch_array($link, $engine, "TINYINT", -11, "-11", 20);
+	func_mysqli_fetch_array($link, $engine, "TINYINT", NULL, NULL, 30);
+	func_mysqli_fetch_array($link, $engine, "TINYINT UNSIGNED", 1, "1", 40);
+	func_mysqli_fetch_array($link, $engine, "TINYINT UNSIGNED", NULL, NULL, 50);
+
+	func_mysqli_fetch_array($link, $engine, "BOOL", 1, "1", 60);
+	func_mysqli_fetch_array($link, $engine, "BOOL", NULL, NULL, 70);
+	func_mysqli_fetch_array($link, $engine, "BOOLEAN", 0, "0", 80);
+	func_mysqli_fetch_array($link, $engine, "BOOLEAN", NULL, NULL, 90);
+
+	func_mysqli_fetch_array($link, $engine, "SMALLINT", -32768, "-32768", 100);
+	func_mysqli_fetch_array($link, $engine, "SMALLINT", 32767, "32767", 110);
+	func_mysqli_fetch_array($link, $engine, "SMALLINT", NULL, NULL, 120);
+	func_mysqli_fetch_array($link, $engine, "SMALLINT UNSIGNED", 65535, "65535", 130);
+	func_mysqli_fetch_array($link, $engine, "SMALLINT UNSIGNED", NULL, NULL, 140);
+
+	func_mysqli_fetch_array($link, $engine, "MEDIUMINT", -8388608, "-8388608", 150);
+	func_mysqli_fetch_array($link, $engine, "MEDIUMINT", 8388607, "8388607", 160);
+	func_mysqli_fetch_array($link, $engine, "MEDIUMINT", NULL, NULL, 170);
+	func_mysqli_fetch_array($link, $engine, "MEDIUMINT UNSIGNED", 16777215, "16777215",
180);
+	func_mysqli_fetch_array($link, $engine, "MEDIUMINT UNSIGNED", NULL, NULL, 190);
+
+	func_mysqli_fetch_array($link, $engine, "INTEGER", -2147483648, "-2147483648", 200);
+	func_mysqli_fetch_array($link, $engine, "INTEGER", 2147483647, "2147483647", 210);
+	func_mysqli_fetch_array($link, $engine, "INTEGER", NULL, NULL, 220);
+	func_mysqli_fetch_array($link, $engine, "INTEGER UNSIGNED", 4294967295, "4294967295",
230);
+	func_mysqli_fetch_array($link, $engine, "INTEGER UNSIGNED", NULL, NULL, 240);
+
+	if ($IS_MYSQLND ||
+		((mysqli_get_server_version($link) >= 51000) &&
+		(mysqli_get_client_version($link) >= 51000))) {
+		func_mysqli_fetch_array($link, $engine, "BIGINT", -9223372036854775808,
"-9223372036854775808", 250);
+		func_mysqli_fetch_array($link, $engine, "BIGINT", NULL, NULL, 260);
+		func_mysqli_fetch_array($link, $engine, "BIGINT UNSIGNED", 18446744073709551615,
"18446744073709551615", 260);
+		func_mysqli_fetch_array($link, $engine, "BIGINT UNSIGNED", NULL, NULL, 280);
+	}
+
+	func_mysqli_fetch_array($link, $engine, "FLOAT", -9223372036854775808 - 1.1,
"-9.22337e+18", 290, "/-9\.22337e\+[0]?18/iu");
+	func_mysqli_fetch_array($link, $engine, "FLOAT", NULL, NULL, 300);
+	func_mysqli_fetch_array($link, $engine, "FLOAT UNSIGNED", 18446744073709551615 + 1.1,
"1.84467e+19", 310, "/1\.84467e\+[0]?19/iu");
+	func_mysqli_fetch_array($link, $engine, "FLOAT UNSIGNED ", NULL, NULL, 320);
+
+	func_mysqli_fetch_array($link, $engine, "DOUBLE(10,2)", -99999999.99, "-99999999.99",
330);
+	func_mysqli_fetch_array($link, $engine, "DOUBLE(10,2)", NULL, NULL, 340);
+	func_mysqli_fetch_array($link, $engine, "DOUBLE(10,2) UNSIGNED", 99999999.99,
"99999999.99", 350);
+	func_mysqli_fetch_array($link, $engine, "DOUBLE(10,2) UNSIGNED", NULL, NULL, 360);
+
+	func_mysqli_fetch_array($link, $engine, "DECIMAL(10,2)", -99999999.99, "-99999999.99",
370);
+	func_mysqli_fetch_array($link, $engine, "DECIMAL(10,2)", NULL, NULL, 380);
+	func_mysqli_fetch_array($link, $engine, "DECIMAL(10,2)", 99999999.99, "99999999.99",
390);
+	func_mysqli_fetch_array($link, $engine, "DECIMAL(10,2)", NULL, NULL, 400);
+
+		// don't care about date() strict TZ warnings...
 	$date = @date('Y-m-d');
-    func_mysqli_fetch_array($link, $engine, "DATE",$date, $date, 410);
-    func_mysqli_fetch_array($link, $engine, "DATE NOT NULL",$date, $date, 420);
-    func_mysqli_fetch_array($link, $engine, "DATE", NULL, NULL, 430);
-    
+	func_mysqli_fetch_array($link, $engine, "DATE",$date, $date, 410);
+	func_mysqli_fetch_array($link, $engine, "DATE NOT NULL",$date, $date, 420);
+	func_mysqli_fetch_array($link, $engine, "DATE", NULL, NULL, 430);
+
 	$date = @date('Y-m-d H:i:s');
-    func_mysqli_fetch_array($link, $engine, "DATETIME", $date, $date, 440);
-    func_mysqli_fetch_array($link, $engine, "DATETIME NOT NULL", $date, $date, 450);
-    func_mysqli_fetch_array($link, $engine, "DATETIME", NULL, NULL, 460);
-    
-    func_mysqli_fetch_array($link, $engine, "TIMESTAMP", @date('Y-m-d H:i:s'),
@date('Y-m-d H:i:s'), 470);
-    
+	func_mysqli_fetch_array($link, $engine, "DATETIME", $date, $date, 440);
+	func_mysqli_fetch_array($link, $engine, "DATETIME NOT NULL", $date, $date, 450);
+	func_mysqli_fetch_array($link, $engine, "DATETIME", NULL, NULL, 460);
+	func_mysqli_fetch_array($link, $engine, "TIMESTAMP", $date, $date, 470);
+
 	$date = @date('H:i:s');
-    func_mysqli_fetch_array($link, $engine, "TIME", $date, $date, 480);
-    func_mysqli_fetch_array($link, $engine, "TIME NOT NULL", $date, $date, 490);
-    func_mysqli_fetch_array($link, $engine, "TIME", NULL, NULL, 500);
-    
-    func_mysqli_fetch_array($link, $engine, "YEAR", @date('Y'), @date('Y'), 510);
-    func_mysqli_fetch_array($link, $engine, "YEAR NOT NULL", @date('Y'), @date('Y'),
520);
-    func_mysqli_fetch_array($link, $engine, "YEAR", NULL, NULL, 530);
-    
-    $string255 = func_mysqli_fetch_array_make_string(255);
-        
-    func_mysqli_fetch_array($link, $engine, "CHAR(1)", "a", "a", 540);
-    func_mysqli_fetch_array($link, $engine, "CHAR(255)", $string255,  $string255, 550);
-    func_mysqli_fetch_array($link, $engine, "CHAR(1) NOT NULL", "a", "a", 560);
-    func_mysqli_fetch_array($link, $engine, "CHAR(1)", NULL, NULL, 570);
-    
-    $string65k = func_mysqli_fetch_array_make_string(65535);
-    
-    func_mysqli_fetch_array($link, $engine, "VARCHAR(1)", "a", "a", 580);
-    func_mysqli_fetch_array($link, $engine, "VARCHAR(255)", $string255, $string255, 590);
-    func_mysqli_fetch_array($link, $engine, "VARCHAR(65635)", $string65k, $string65k,
600);
-    func_mysqli_fetch_array($link, $engine, "VARCHAR(1) NOT NULL", "a", "a", 610);
-    func_mysqli_fetch_array($link, $engine, "VARCHAR(1)", NULL, NULL, 620);
-    
-    func_mysqli_fetch_array($link, $engine, "BINARY(1)", "a", "a", 630, null, true);
-    func_mysqli_fetch_array($link, $engine, "BINARY(2)", chr(0) . "a", chr(0) . "a", 640,
null, true);
-    func_mysqli_fetch_array($link, $engine, "BINARY(1) NOT NULL", "b", "b", 650, null,
true);
-    func_mysqli_fetch_array($link, $engine, "BINARY(1)", NULL, NULL, 660, null, true);
-    
-    func_mysqli_fetch_array($link, $engine, "VARBINARY(1)", "a", "a", 670, null, true);
-    func_mysqli_fetch_array($link, $engine, "VARBINARY(2)", chr(0) . "a", chr(0) . "a",
680, null, true);
-    func_mysqli_fetch_array($link, $engine, "VARBINARY(1) NOT NULL", "b", "b", 690, null,
true);
-    func_mysqli_fetch_array($link, $engine, "VARBINARY(1)", NULL, NULL, 700, null, true);
-    
-    func_mysqli_fetch_array($link, $engine, "TINYBLOB", "a", "a", 710, null, true);
-    func_mysqli_fetch_array($link, $engine, "TINYBLOB", chr(0) . "a", chr(0) . "a", 720,
null, true);
-    func_mysqli_fetch_array($link, $engine, "TINYBLOB NOT NULL", "b", "b", 730, null,
true); 
-    func_mysqli_fetch_array($link, $engine, "TINYBLOB", NULL, NULL, 740, null, true);
-    
-    func_mysqli_fetch_array($link, $engine, "TINYTEXT", "a", "a", 750);
-    func_mysqli_fetch_array($link, $engine, "TINYTEXT NOT NULL", "a", "a", 760);
-    func_mysqli_fetch_array($link, $engine, "TINYTEXT", NULL, NULL, 770);
-    
-    func_mysqli_fetch_array($link, $engine, "BLOB", "a", "a", 780, null, true);
-    func_mysqli_fetch_array($link, $engine, "BLOB", chr(0) . "a", chr(0) . "a", 780,
null, true);
-    func_mysqli_fetch_array($link, $engine, "BLOB", NULL, NULL, 790, null, true);
-       
-    func_mysqli_fetch_array($link, $engine, "TEXT", "a", "a", 800);
-    func_mysqli_fetch_array($link, $engine, "TEXT", chr(0) . "a", chr(0) . "a", 810);
-    func_mysqli_fetch_array($link, $engine, "TEXT", NULL, NULL, 820);
-    
-    func_mysqli_fetch_array($link, $engine, "MEDIUMBLOB", "a", "a", 830, null, true);
-    func_mysqli_fetch_array($link, $engine, "MEDIUMBLOB", chr(0) . "a", chr(0) . "a",
840, null, true);
-    func_mysqli_fetch_array($link, $engine, "MEDIUMBLOB", NULL, NULL, 850, null, true);
-    
-    func_mysqli_fetch_array($link, $engine, "MEDIUMTEXT", "a", "a", 860);
-    func_mysqli_fetch_array($link, $engine, "MEDIUMTEXT", chr(0) . "a", chr(0) . "a",
870);
-    func_mysqli_fetch_array($link, $engine, "MEDIUMTEXT", NULL, NULL, 880);
-    
-    func_mysqli_fetch_array($link, $engine, "LONGBLOB", "a", "a", 890, null, true);
-    func_mysqli_fetch_array($link, $engine, "LONGTEXT", chr(0) . "a", chr(0) . "a", 900);
-    func_mysqli_fetch_array($link, $engine, "LONGBLOB", NULL, NULL, 910, null, true);
-    
-    func_mysqli_fetch_array($link, $engine, "ENUM('a', 'b')", "a", "a", 920);
-    func_mysqli_fetch_array($link, $engine, "ENUM('a', 'b')", NULL, NULL, 930);
-    
-    func_mysqli_fetch_array($link, $engine, "SET('a', 'b')", "a", "a", 940);  
-    func_mysqli_fetch_array($link, $engine, "SET('a', 'b')", NULL, NULL, 950);
-        
-    mysqli_close($link);
-   
-    if (null !== ($tmp = mysqli_fetch_array($res, MYSQLI_ASSOC)))
-        printf("[015] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-        
-    print "done!";
+	func_mysqli_fetch_array($link, $engine, "TIME", $date, $date, 480);
+	func_mysqli_fetch_array($link, $engine, "TIME NOT NULL", $date, $date, 490);
+	func_mysqli_fetch_array($link, $engine, "TIME", NULL, NULL, 500);
+
+	func_mysqli_fetch_array($link, $engine, "YEAR", @date('Y'), @date('Y'), 510);
+	func_mysqli_fetch_array($link, $engine, "YEAR NOT NULL", @date('Y'), @date('Y'), 520);
+	func_mysqli_fetch_array($link, $engine, "YEAR", NULL, NULL, 530);
+
+	$string255 = func_mysqli_fetch_array_make_string(255);
+	func_mysqli_fetch_array($link, $engine, "CHAR(1)", "a", "a", 540);
+	func_mysqli_fetch_array($link, $engine, "CHAR(255)", $string255,  $string255, 550);
+	func_mysqli_fetch_array($link, $engine, "CHAR(1) NOT NULL", "a", "a", 560);
+	func_mysqli_fetch_array($link, $engine, "CHAR(1)", NULL, NULL, 570);
+
+	$string65k = func_mysqli_fetch_array_make_string(65535);
+	func_mysqli_fetch_array($link, $engine, "VARCHAR(1)", "a", "a", 580);
+	func_mysqli_fetch_array($link, $engine, "VARCHAR(255)", $string255, $string255, 590);
+	func_mysqli_fetch_array($link, $engine, "VARCHAR(65635)", $string65k, $string65k, 600);
+	func_mysqli_fetch_array($link, $engine, "VARCHAR(1) NOT NULL", "a", "a", 610);
+	func_mysqli_fetch_array($link, $engine, "VARCHAR(1)", NULL, NULL, 620);
+
+	func_mysqli_fetch_array($link, $engine, "BINARY(1)", "a", "a", 630, null, true);
+	func_mysqli_fetch_array($link, $engine, "BINARY(2)", chr(0) . "a", chr(0) . "a", 640,
null, true);
+	func_mysqli_fetch_array($link, $engine, "BINARY(1) NOT NULL", "b", "b", 650, null,
true);
+	func_mysqli_fetch_array($link, $engine, "BINARY(1)", NULL, NULL, 660, null, true);
+
+	func_mysqli_fetch_array($link, $engine, "VARBINARY(1)", "a", "a", 670, null, true);
+	func_mysqli_fetch_array($link, $engine, "VARBINARY(2)", chr(0) . "a", chr(0) . "a", 680,
null, true);
+	func_mysqli_fetch_array($link, $engine, "VARBINARY(1) NOT NULL", "b", "b", 690, null,
true);
+	func_mysqli_fetch_array($link, $engine, "VARBINARY(1)", NULL, NULL, 700, null, true);
+
+	func_mysqli_fetch_array($link, $engine, "TINYBLOB", "a", "a", 710, null, true);
+	func_mysqli_fetch_array($link, $engine, "TINYBLOB", chr(0) . "a", chr(0) . "a", 720,
null, true);
+	func_mysqli_fetch_array($link, $engine, "TINYBLOB NOT NULL", "b", "b", 730, null, true);
+	func_mysqli_fetch_array($link, $engine, "TINYBLOB", NULL, NULL, 740, null, true);
+
+	func_mysqli_fetch_array($link, $engine, "TINYTEXT", "a", "a", 750);
+	func_mysqli_fetch_array($link, $engine, "TINYTEXT NOT NULL", "a", "a", 760);
+	func_mysqli_fetch_array($link, $engine, "TINYTEXT", NULL, NULL, 770);
+
+	func_mysqli_fetch_array($link, $engine, "BLOB", "a", "a", 780, null, true);
+	func_mysqli_fetch_array($link, $engine, "BLOB", chr(0) . "a", chr(0) . "a", 780, null,
true);
+	func_mysqli_fetch_array($link, $engine, "BLOB", NULL, NULL, 790, null, true);
+
+	func_mysqli_fetch_array($link, $engine, "TEXT", "a", "a", 800);
+	func_mysqli_fetch_array($link, $engine, "TEXT", chr(0) . "a", chr(0) . "a", 810);
+	func_mysqli_fetch_array($link, $engine, "TEXT", NULL, NULL, 820);
+
+	func_mysqli_fetch_array($link, $engine, "MEDIUMBLOB", "a", "a", 830, null, true);
+	func_mysqli_fetch_array($link, $engine, "MEDIUMBLOB", chr(0) . "a", chr(0) . "a", 840,
null, true);
+	func_mysqli_fetch_array($link, $engine, "MEDIUMBLOB", NULL, NULL, 850, null, true);
+
+	func_mysqli_fetch_array($link, $engine, "MEDIUMTEXT", "a", "a", 860);
+	func_mysqli_fetch_array($link, $engine, "MEDIUMTEXT", chr(0) . "a", chr(0) . "a", 870);
+	func_mysqli_fetch_array($link, $engine, "MEDIUMTEXT", NULL, NULL, 880);
+
+	func_mysqli_fetch_array($link, $engine, "LONGBLOB", "a", "a", 890, null, true);
+	func_mysqli_fetch_array($link, $engine, "LONGTEXT", chr(0) . "a", chr(0) . "a", 900);
+	func_mysqli_fetch_array($link, $engine, "LONGBLOB", NULL, NULL, 910, null, true);
+
+	func_mysqli_fetch_array($link, $engine, "ENUM('a', 'b')", "a", "a", 920);
+	func_mysqli_fetch_array($link, $engine, "ENUM('a', 'b')", NULL, NULL, 930);
+
+	func_mysqli_fetch_array($link, $engine, "SET('a', 'b')", "a", "a", 940);
+	func_mysqli_fetch_array($link, $engine, "SET('a', 'b')", NULL, NULL, 950);
+
+	mysqli_close($link);
+
+	if (null !== ($tmp = mysqli_fetch_array($res, MYSQLI_ASSOC)))
+		printf("[015] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+	print "done!";
 ?>
 --EXPECTF--
 [005]
@@ -371,7 +368,7 @@
 Warning: mysqli_fetch_array(): The result type should be either MYSQLI_NUM, MYSQLI_ASSOC
or MYSQLI_BOTH in %s on line %d
 
 Warning: mysqli_fetch_array(): Couldn't fetch mysqli_result in %s on line %d
-done! 
+done!
 --UEXPECTF--
 [005]
 array(4) {
@@ -451,4 +448,4 @@
 Warning: mysqli_fetch_array(): The result type should be either MYSQLI_NUM, MYSQLI_ASSOC
or MYSQLI_BOTH in %s on line %d
 
 Warning: mysqli_fetch_array(): Couldn't fetch mysqli_result in %s on line %d
-done! 
+done!
\ No newline at end of file

Modified: trunk/tests/ext/mysqli/mysqli_fetch_array_assoc.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_array_assoc.phpt	2007-07-17 12:36:34 UTC (rev 773)
+++ trunk/tests/ext/mysqli/mysqli_fetch_array_assoc.phpt	2007-07-17 12:40:56 UTC (rev 774)
@@ -5,24 +5,25 @@
 <?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
-    include "connect.inc";
-    require('table.inc');    
-    if (!$res = mysqli_query($link, "SELECT * FROM test ORDER BY id LIMIT 5")) {
-        printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-    }    
-    print "[002]\n";
-    var_dump(mysqli_fetch_array($res, MYSQLI_ASSOC));
-    mysqli_free_result($res);
-    
-    if (!$res = mysqli_query($link, "SELECT id, label FROM test ORDER BY id LIMIT 5")) {
-        printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-    }    
-    print "[004]\n";
-    var_dump(mysqli_fetch_array($res, MYSQLI_ASSOC));
-    mysqli_free_result($res);
-    
-    mysqli_close($link);
-    print "done!";
+	include "connect.inc";
+	require('table.inc');
+
+	if (!$res = mysqli_query($link, "SELECT * FROM test ORDER BY id LIMIT 5")) {
+		printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+	}
+	print "[002]\n";
+	var_dump(mysqli_fetch_array($res, MYSQLI_ASSOC));
+	mysqli_free_result($res);
+
+	if (!$res = mysqli_query($link, "SELECT id, label FROM test ORDER BY id LIMIT 5")) {
+		printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+	}
+	print "[004]\n";
+	var_dump(mysqli_fetch_array($res, MYSQLI_ASSOC));
+	mysqli_free_result($res);
+
+	mysqli_close($link);
+	print "done!";
 ?>
 --EXPECTF--
 [002]
@@ -39,7 +40,7 @@
   ["label"]=>
   string(1) "a"
 }
-done! 
+done!
 --UEXPECTF--
 [002]
 array(2) {
@@ -55,4 +56,4 @@
   [u"label"]=>
   unicode(1) "a"
 }
-done! 
+done!
\ No newline at end of file

Modified: trunk/tests/ext/mysqli/mysqli_fetch_array_many_rows.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_array_many_rows.phpt	2007-07-17 12:36:34 UTC (rev
773)
+++ trunk/tests/ext/mysqli/mysqli_fetch_array_many_rows.phpt	2007-07-17 12:40:56 UTC (rev
774)
@@ -1,109 +1,111 @@
 --TEST--
 mysqli_fetch_array()
 --SKIPIF--
-<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
+<?php
+require_once('skipifemb.inc');
+require_once('skipif.inc');
+?>
 --FILE--
 <?php
-    include "connect.inc";
-    require("table.inc");
-    
-    // do as much as we can do in 5 seconds
-    $start = microtime(true);
-    for ($id = 100, $start = microtime(true); (microtime(true) - $start) < 5; $id++) {
     
-      if (!mysqli_query($link, $sql = sprintf("INSERT INTO test(id, label) VALUES (%d,
'%s')",
-        $id, mysqli_real_escape_string($link, chr(65 + ($id % 26)))))) {
-          printf("[001] %s failed: [%d] %s\n", $sql, mysqli_errno($link),
mysqli_error($link));
-          break;
-      }
-    }
-    
-    if (!$res = mysqli_query($link, 'SELECT id, label FROM test')) {
-      printf("[002] SELECT failed: [%d] %s\n", mysqli_errno($link), mysqli_errno($link));
     
-    }
-      
-    while ($row = mysqli_fetch_array($res)) {
-      // overwrite results and check if the cache magic works
-      $row['label'] = NULL;
-    }
-    mysqli_free_result($res);
-    
-    if (!$res = mysqli_query($link, 'SELECT id, label FROM test')) {
-      printf("[003] SELECT failed: [%d] %s\n", mysqli_errno($link), mysqli_errno($link));
     
-    }
-      
-    $i = 0;
-    $results = array();
-    while ($row = mysqli_fetch_array($res, MYSQLI_BOTH)) {
-      
-      // create copies and destroy later
-      $results[$i++] = &$row;
-      if ($i % 999) {
-        $results = array();        
-      }      
-            
-      if ($row[0] < 0 || $row[0] > $id) {        
-        printf("[004] Unexpected result row[0] = '%s' (range 0...%d), [%d] %s\n",
-          $row[0], $id, mysqli_errno($link), mysqli_error($link));
-       break;
-      }
-      if ($row[0] !== $row['id']) {
-        printf("[005] Unexpected result row[0] = '%s', row[id] = '%s', [%d] %s\n",
-          $row[0], $row[id], mysqli_errno($link), mysqli_error($link));
-        break;       
-      }
-      
-      $len = strlen($row[1]);
-      if (!is_string($row[1]) || $len == 0 || $len > 1) {
-        printf("[006] Unexpected result row[1] = '%s', [%d] %s\n",
-          $row[1], mysqli_errno($link), mysqli_error($link));
-        break;
-      }
-      if ($row[1] !== $row['label']) {
-        printf("[007] Unexpected result row[1] = '%s', row[label] = '%s', [%d] %s\n", 
-          $row[1], $row['label'], mysqli_errno($link), mysqli_error($link));
-        break;
-      }            
-      
-    }
-    mysqli_free_result($res);
-       
-    if (!$res = mysqli_query($link, 'SELECT id, label FROM test')) {
-      printf("[008] SELECT failed: [%d] %s\n", mysqli_errno($link), mysqli_errno($link));
     
-    }
-      
-    while ($row = mysqli_fetch_array($res, MYSQLI_ASSOC)) {
-      // overwrite results and check if the cache magic works
-      $row['label'] = NULL;
-    }
-    mysqli_free_result($res);
-    
-    if (!$res = mysqli_query($link, 'SELECT count(*) AS num FROM test')) {
-      printf("[009] SELECT failed: [%d] %s\n", mysqli_errno($link), mysqli_errno($link));
     
-    }
-    $row = mysqli_fetch_assoc($res);
-    $num = $row['num'];
-    mysqli_free_result($res);
-        
-    if (!$res = mysqli_query($link, 'SELECT id, label FROM test')) {
-      printf("[010] SELECT failed: [%d] %s\n", mysqli_errno($link), mysqli_errno($link));
     
-    }
-    
-    $i = 0;
-    while ($row = mysqli_fetch_array($res, MYSQLI_NUM)) {
-      // overwrite results and check if the cache magic works
-      $row[0] = NULL;
-      $i++;
-    }
-    mysqli_free_result($res);
-    
-    if ($i != $num)
-      printf("[011] Expecting %d results, got %d results, [%d] %s\n", 
-        $num, $i, mysqli_errno($link), mysqli_error($link));
+	include "connect.inc";
+	require("table.inc");
 
-    mysqli_close($link);
-    
-    print "done!";
+	// do as much as we can do in 5 seconds
+	$start = microtime(true);
+	for ($id = 100, $start = microtime(true); (microtime(true) - $start) < 5; $id++) {
+		if (!mysqli_query($link, $sql = sprintf("INSERT INTO test(id, label) VALUES (%d,
'%s')",
+			$id, mysqli_real_escape_string($link, chr(65 + ($id % 26)))))) {
+				printf("[001] %s failed: [%d] %s\n", $sql, mysqli_errno($link), mysqli_error($link));
+				break;
+		}
+	}
+
+	if (!$res = mysqli_query($link, 'SELECT id, label FROM test')) {
+		printf("[002] SELECT failed: [%d] %s\n", mysqli_errno($link), mysqli_errno($link));
+	}
+
+	while ($row = mysqli_fetch_array($res)) {
+		// overwrite results and check if the cache magic works
+		$row['label'] = NULL;
+	}
+	mysqli_free_result($res);
+
+	if (!$res = mysqli_query($link, 'SELECT id, label FROM test')) {
+		printf("[003] SELECT failed: [%d] %s\n", mysqli_errno($link), mysqli_errno($link));
+	}
+
+	$i = 0;
+	$results = array();
+	while ($row = mysqli_fetch_array($res, MYSQLI_BOTH)) {
+
+		// create copies and destroy later
+		$results[$i++] = &$row;
+		if ($i % 999) {
+			$results = array();
+		}
+
+		if ($row[0] < 0 || $row[0] > $id) {
+			printf("[004] Unexpected result row[0] = '%s' (range 0...%d), [%d] %s\n",
+				$row[0], $id, mysqli_errno($link), mysqli_error($link));
+			break;
+		}
+		if ($row[0] !== $row['id']) {
+			printf("[005] Unexpected result row[0] = '%s', row[id] = '%s', [%d] %s\n",
+				$row[0], $row[id], mysqli_errno($link), mysqli_error($link));
+			break;
+		}
+
+		$len = strlen($row[1]);
+		if (!is_string($row[1]) || $len == 0 || $len > 1) {
+			printf("[006] Unexpected result row[1] = '%s', [%d] %s\n",
+				$row[1], mysqli_errno($link), mysqli_error($link));
+			break;
+		}
+		if ($row[1] !== $row['label']) {
+			printf("[007] Unexpected result row[1] = '%s', row[label] = '%s', [%d] %s\n",
+				$row[1], $row['label'], mysqli_errno($link), mysqli_error($link));
+			break;
+		}
+
+	}
+	mysqli_free_result($res);
+
+	if (!$res = mysqli_query($link, 'SELECT id, label FROM test')) {
+		printf("[008] SELECT failed: [%d] %s\n", mysqli_errno($link), mysqli_errno($link));
+	}
+
+	while ($row = mysqli_fetch_array($res, MYSQLI_ASSOC)) {
+		// overwrite results and check if the cache magic works
+		$row['label'] = NULL;
+	}
+	mysqli_free_result($res);
+
+	if (!$res = mysqli_query($link, 'SELECT count(*) AS num FROM test')) {
+		printf("[009] SELECT failed: [%d] %s\n", mysqli_errno($link), mysqli_errno($link));
+	}
+	$row = mysqli_fetch_assoc($res);
+	$num = $row['num'];
+	mysqli_free_result($res);
+
+	if (!$res = mysqli_query($link, 'SELECT id, label FROM test')) {
+		printf("[010] SELECT failed: [%d] %s\n", mysqli_errno($link), mysqli_errno($link));
+	}
+
+	$i = 0;
+	while ($row = mysqli_fetch_array($res, MYSQLI_NUM)) {
+		// overwrite results and check if the cache magic works
+		$row[0] = NULL;
+		$i++;
+	}
+	mysqli_free_result($res);
+
+	if ($i != $num)
+		printf("[011] Expecting %d results, got %d results, [%d] %s\n",
+			$num, $i, mysqli_errno($link), mysqli_error($link));
+
+	mysqli_close($link);
+
+	print "done!";
 ?>
 --EXPECTF--
 done!
\ No newline at end of file

Modified: trunk/tests/ext/mysqli/mysqli_fetch_array_oo.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_array_oo.phpt	2007-07-17 12:36:34 UTC (rev 773)
+++ trunk/tests/ext/mysqli/mysqli_fetch_array_oo.phpt	2007-07-17 12:40:56 UTC (rev 774)
@@ -5,276 +5,270 @@
 <?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
-    include "connect.inc";
+	include "connect.inc";
 
-    $tmp    = NULL;   
-    $link   = NULL;    
-    
-    require('table.inc');    
-    if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket))
-        printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***,
dbname=%s, port=%s, socket=%s\n",
-            $host, $user, $db, $port, $socket);
+	$tmp    = NULL;
+	$link   = NULL;
 
-    if (!$res = $mysqli->query("SELECT * FROM test ORDER BY id LIMIT 5")) {
-        printf("[004] [%d] %s\n", $mysqli->errno, $mysqli->error);
-    }    
-    
-    print "[005]\n";
-    var_dump($res->fetch_array());
-    
-    print "[006]\n";
-    var_dump($res->fetch_array(MYSQLI_NUM));
-    
-    print "[007]\n";
-    var_dump($res->fetch_array(MYSQLI_BOTH));
-    
-    print "[008]\n";
-    var_dump($res->fetch_array(MYSQLI_ASSOC));
+	require('table.inc');
+	if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket))
+		printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***,
dbname=%s, port=%s, socket=%s\n",
+			$host, $user, $db, $port, $socket);
 
-    print "[009]\n";
-    var_dump($res->fetch_array());
-    
-    $res->free_result();
-    
-    if (!$res = $mysqli->query("SELECT 1 AS a, 2 AS a, 3 AS c, 4 AS C, NULL AS d, true
AS e")) {
-        printf("[010] Cannot run query, [%d] %s\n", $mysqli->errno,
$$mysqli->error);
-    }
-    print "[011]\n";
-    var_dump($res->fetch_array(MYSQLI_BOTH));
-    
-    $res->free_result();    
-    if (!$res = $mysqli->query("SELECT 1 AS a, 2 AS b, 3 AS c, 4 AS C")) {
-        printf("[012] Cannot run query, [%d] %s\n",
-            $mysqli->errno, $$mysqli->error);
-        exit(1);
-    }
-    
-    do {
-        $illegal_mode = mt_rand(-10000, 10000);
-    } while (in_array($illegal_mode, array(MYSQLI_ASSOC, MYSQLI_NUM, MYSQLI_BOTH)));
-    // NOTE: for BC reasons with ext/mysql, ext/mysqli accepts invalid result modes.  
-    $tmp = $res->fetch_array($illegal_mode);
-    if (false !== $tmp) 
-        printf("[013] Expecting boolean/false although, got %s/%s. [%d] %s\n", 
-            gettype($tmp), $tmp, $mysqli->errno, $mysqli->error);
-        
-    $tmp = $res->fetch_array($illegal_mode);
-    if (false !== $tmp)
-        printf("[014] Expecting boolean/false, got %s/%s. [%d] %s\n", 
-            gettype($tmp), $tmp, $mysqli->errno, $mysqli->error);
-    
-    $res->free_result();
-    
-    function func_mysqli_fetch_array($mysqli, $engine, $sql_type, $sql_value, $php_value,
$offset, $regexp_comparison = NULL) {
-        
-        if (!$mysqli->query("DROP TABLE IF EXISTS test")) {
-            printf("[%04d] [%d] %s\n", $offset, $mysqli->errno, $mysqli->error);   
        
-            return false;
-        }
-        
-        if (!$mysqli->query($sql = sprintf("CREATE TABLE test(id INT NOT NULL, label
%s, PRIMARY KEY(id)) ENGINE = %s", $sql_type, $engine))) {
-            print $sql;
-            // don't bail, engine might not support the datatype
-            return false;
-        }
-        
-        if (is_null($php_value) && !$mysqli->query($sql = sprintf("INSERT INTO
test(id, label) VALUES (1, NULL)"))) {
-            printf("[%04d] [%d] %s\n", $offset + 1, $mysqli->errno,
$mysqli->error);
-            return false;
-        } 
-        
-        if (!is_null($php_value)) {
-            if (is_int($sql_value) && !$mysqli->query(sprintf("INSERT INTO
test(id, label) VALUES (1, '%d')", $sql_value))) {
-                printf("[%04d] [%d] %s\n", $offset + 1, $mysqli->errno,
$mysqli->error);
-                return false;
-            } else if (!is_int($sql_value) && !$mysqli->query(sprintf("INSERT
INTO test(id, label) VALUES (1, '%s')", $sql_value))) {
-                printf("[%04d] [%d] %s\n", $offset + 1, $mysqli->errno,
$mysqli->error);
-                return false;
-            }
-        }
-        
-        if (!$res = $mysqli->query("SELECT id, label FROM test")) {
-            printf("[%04d] [%d] %s\n", $offset + 2, $mysqli->errno,
$mysqli->error);
-            return false;
-        }
-        
-        if (!$row = $res->fetch_array(MYSQLI_BOTH)) {
-            printf("[%04d] [%d] %s\n", $offset + 3, $mysqli->errno,
$mysqli->error);
-            return false;
-        }
+	if (!$res = $mysqli->query("SELECT * FROM test ORDER BY id LIMIT 5")) {
+		printf("[004] [%d] %s\n", $mysqli->errno, $mysqli->error);
+	}
+
+	print "[005]\n";
+	var_dump($res->fetch_array());
+
+	print "[006]\n";
+	var_dump($res->fetch_array(MYSQLI_NUM));
+
+	print "[007]\n";
+	var_dump($res->fetch_array(MYSQLI_BOTH));
+
+	print "[008]\n";
+	var_dump($res->fetch_array(MYSQLI_ASSOC));
+
+	print "[009]\n";
+	var_dump($res->fetch_array());
+
+	$res->free_result();
+
+	if (!$res = $mysqli->query("SELECT 1 AS a, 2 AS a, 3 AS c, 4 AS C, NULL AS d, true AS
e")) {
+		printf("[010] Cannot run query, [%d] %s\n", $mysqli->errno, $$mysqli->error);
+	}
+	print "[011]\n";
+	var_dump($res->fetch_array(MYSQLI_BOTH));
+
+	$res->free_result();
+	if (!$res = $mysqli->query("SELECT 1 AS a, 2 AS b, 3 AS c, 4 AS C")) {
+		printf("[012] Cannot run query, [%d] %s\n",
+			$mysqli->errno, $$mysqli->error);
+		exit(1);
+	}
+
+	do {
+		$illegal_mode = mt_rand(-10000, 10000);
+	} while (in_array($illegal_mode, array(MYSQLI_ASSOC, MYSQLI_NUM, MYSQLI_BOTH)));
+	// NOTE: for BC reasons with ext/mysql, ext/mysqli accepts invalid result modes.
+	$tmp = $res->fetch_array($illegal_mode);
+	if (false !== $tmp)
+		printf("[013] Expecting boolean/false although, got %s/%s. [%d] %s\n",
+			gettype($tmp), $tmp, $mysqli->errno, $mysqli->error);
+
+	$tmp = $res->fetch_array($illegal_mode);
+	if (false !== $tmp)
+		printf("[014] Expecting boolean/false, got %s/%s. [%d] %s\n",
+			gettype($tmp), $tmp, $mysqli->errno, $mysqli->error);
+
+	$res->free_result();
+
+	function func_mysqli_fetch_array($mysqli, $engine, $sql_type, $sql_value, $php_value,
$offset, $regexp_comparison = NULL) {
+
+		if (!$mysqli->query("DROP TABLE IF EXISTS test")) {
+			printf("[%04d] [%d] %s\n", $offset, $mysqli->errno, $mysqli->error);
+			return false;
+		}
+
+		if (!$mysqli->query($sql = sprintf("CREATE TABLE test(id INT NOT NULL, label %s,
PRIMARY KEY(id)) ENGINE = %s", $sql_type, $engine))) {
+			print $sql;
+			// don't bail, engine might not support the datatype
+			return false;
+		}
+
+		if (is_null($php_value) && !$mysqli->query($sql = sprintf("INSERT INTO
test(id, label) VALUES (1, NULL)"))) {
+			printf("[%04d] [%d] %s\n", $offset + 1, $mysqli->errno, $mysqli->error);
+			return false;
+		}
+
+		if (!is_null($php_value)) {
+			if (is_int($sql_value) && !$mysqli->query(sprintf("INSERT INTO test(id,
label) VALUES (1, '%d')", $sql_value))) {
+				printf("[%04d] [%d] %s\n", $offset + 1, $mysqli->errno, $mysqli->error);
+				return false;
+			} else if (!is_int($sql_value) && !$mysqli->query(sprintf("INSERT INTO
test(id, label) VALUES (1, '%s')", $sql_value))) {
+				printf("[%04d] [%d] %s\n", $offset + 1, $mysqli->errno, $mysqli->error);
+				return false;
+			}
+		}
+
+		if (!$res = $mysqli->query("SELECT id, label FROM test")) {
+			printf("[%04d] [%d] %s\n", $offset + 2, $mysqli->errno, $mysqli->error);
+			return false;
+		}
+
+		if (!$row = $res->fetch_array(MYSQLI_BOTH)) {
+			printf("[%04d] [%d] %s\n", $offset + 3, $mysqli->errno, $mysqli->error);
+			return false;
+		}
 		$fields = mysqli_fetch_fields($res);
 
-		if (!(gettype($php_value)=="unicode" && ($fields[1]->flags & 128))) {   
    
-        	if ($regexp_comparison) {
-            	if (!preg_match($regexp_comparison, (string)$row['label']) ||
!preg_match($regexp_comparison, (string)$row[1])) {
-               		printf("[%04d] Expecting %s/%s [reg exp = %s], got %s/%s resp. %s/%s.
[%d] %s\n", $offset + 4, 
-                    gettype($php_value), $php_value, $regexp_comparison,
-                    gettype($row[1]), $row[1],
-                    gettype($row['label']), $row['label'], $mysqli->errno,
$mysqli->error);
-                	return false;
-            	}
-            
-       		} else {
-         	   if (($row['label'] !== $php_value) || ($row[1] != $php_value)) {
-                printf("[%04d] Expecting %s/%s, got %s/%s resp. %s/%s. [%d] %s\n",
$offset + 4, 
-            	        gettype($php_value), $php_value,
-                    gettype($row[1]), $row[1],
-                    gettype($row['label']), $row['label'], $mysqli->errno,
$mysqli->error);
-        	        return false;
-    	        }
-	        }
-        }
-        return true;
-    }
-    
-    function func_mysqli_fetch_array_make_string($len) {
-                
-        $ret = '';
-        for ($i = 0; $i < $len; $i++)
-            $ret .= chr(mt_rand(65, 90));
-            
-        return $ret;            
-    }
-    
-    func_mysqli_fetch_array($mysqli, $engine, "TINYINT", -11, "-11", 20);    
-    func_mysqli_fetch_array($mysqli, $engine, "TINYINT", NULL, NULL, 30);
-    func_mysqli_fetch_array($mysqli, $engine, "TINYINT UNSIGNED", 1, "1", 40);
-    func_mysqli_fetch_array($mysqli, $engine, "TINYINT UNSIGNED", NULL, NULL, 50);
-    
-    func_mysqli_fetch_array($mysqli, $engine, "BOOL", 1, "1", 60);    
-    func_mysqli_fetch_array($mysqli, $engine, "BOOL", NULL, NULL, 70);    
-    func_mysqli_fetch_array($mysqli, $engine, "BOOLEAN", 0, "0", 80);
-    func_mysqli_fetch_array($mysqli, $engine, "BOOLEAN", NULL, NULL, 90);
-    
-    func_mysqli_fetch_array($mysqli, $engine, "SMALLINT", -32768, "-32768", 100);
-    func_mysqli_fetch_array($mysqli, $engine, "SMALLINT", 32767, "32767", 110);
-    func_mysqli_fetch_array($mysqli, $engine, "SMALLINT", NULL, NULL, 120);
-    func_mysqli_fetch_array($mysqli, $engine, "SMALLINT UNSIGNED", 65535, "65535", 130);
-    func_mysqli_fetch_array($mysqli, $engine, "SMALLINT UNSIGNED", NULL, NULL, 140);
-    
-    func_mysqli_fetch_array($mysqli, $engine, "MEDIUMINT", -8388608, "-8388608", 150);
-    func_mysqli_fetch_array($mysqli, $engine, "MEDIUMINT", 8388607, "8388607", 160);
-    func_mysqli_fetch_array($mysqli, $engine, "MEDIUMINT", NULL, NULL, 170);    
-    func_mysqli_fetch_array($mysqli, $engine, "MEDIUMINT UNSIGNED", 16777215, "16777215",
180);
-    func_mysqli_fetch_array($mysqli, $engine, "MEDIUMINT UNSIGNED", NULL, NULL, 190);
-    
-    func_mysqli_fetch_array($mysqli, $engine, "INTEGER", -2147483648, "-2147483648",
200);
-    func_mysqli_fetch_array($mysqli, $engine, "INTEGER", 2147483647, "2147483647", 210);
-    func_mysqli_fetch_array($mysqli, $engine, "INTEGER", NULL, NULL, 220);
-    func_mysqli_fetch_array($mysqli, $engine, "INTEGER UNSIGNED", 4294967295,
"4294967295", 230);
-    func_mysqli_fetch_array($mysqli, $engine, "INTEGER UNSIGNED", NULL, NULL, 240);    
-    
-    /*
-    TODO - test case is buggy, because it depends on the MySQL server version
-    func_mysqli_fetch_array($mysqli, $engine, "BIGINT", -9223372036854775808,
"-9223372036854775808", 250);
-    func_mysqli_fetch_array($mysqli, $engine, "BIGINT", NULL, NULL, 260);
-    func_mysqli_fetch_array($mysqli, $engine, "BIGINT UNSIGNED", 18446744073709551615,
"18446744073709551615", 270);
-    func_mysqli_fetch_array($mysqli, $engine, "BIGINT UNSIGNED", NULL, NULL, 280);
-    */   
-    
-    func_mysqli_fetch_array($mysqli, $engine, "FLOAT", -9223372036854775808 - 1.1,
"-9.22337e+18", 290, "/-9\.22337e\+[0]?18/iu");
-    func_mysqli_fetch_array($mysqli, $engine, "FLOAT", NULL, NULL, 300);
-    func_mysqli_fetch_array($mysqli, $engine, "FLOAT UNSIGNED", 18446744073709551615 +
1.1, "1.84467e+19", 310, "/1\.84467e\+[0]?19/iu");
-    func_mysqli_fetch_array($mysqli, $engine, "FLOAT UNSIGNED ", NULL, NULL, 320);
-    
-    func_mysqli_fetch_array($mysqli, $engine, "DOUBLE(10,2)", -99999999.99,
"-99999999.99", 330);
-    func_mysqli_fetch_array($mysqli, $engine, "DOUBLE(10,2)", NULL, NULL, 340);
-    func_mysqli_fetch_array($mysqli, $engine, "DOUBLE(10,2) UNSIGNED", 99999999.99,
"99999999.99", 350);
-    func_mysqli_fetch_array($mysqli, $engine, "DOUBLE(10,2) UNSIGNED", NULL, NULL, 360);
-    
-    func_mysqli_fetch_array($mysqli, $engine, "DECIMAL(10,2)", -99999999.99,
"-99999999.99", 370);
-    func_mysqli_fetch_array($mysqli, $engine, "DECIMAL(10,2)", NULL, NULL, 380);
-    func_mysqli_fetch_array($mysqli, $engine, "DECIMAL(10,2)", 99999999.99,
"99999999.99", 390);
-    func_mysqli_fetch_array($mysqli, $engine, "DECIMAL(10,2)", NULL, NULL, 400);
-    
-    // don't care about date() strict TZ warnings...
+		if (!(gettype($php_value)=="unicode" && ($fields[1]->flags & 128))) {
+			if ($regexp_comparison) {
+				if (!preg_match($regexp_comparison, (string)$row['label']) ||
!preg_match($regexp_comparison, (string)$row[1])) {
+					printf("[%04d] Expecting %s/%s [reg exp = %s], got %s/%s resp. %s/%s. [%d] %s\n",
$offset + 4,
+						gettype($php_value), $php_value, $regexp_comparison,
+						gettype($row[1]), $row[1],
+						gettype($row['label']), $row['label'], $mysqli->errno, $mysqli->error);
+					return false;
+				}
+			} else {
+				if (($row['label'] !== $php_value) || ($row[1] != $php_value)) {
+					printf("[%04d] Expecting %s/%s, got %s/%s resp. %s/%s. [%d] %s\n", $offset + 4,
+						gettype($php_value), $php_value,
+						gettype($row[1]), $row[1],
+						gettype($row['label']), $row['label'], $mysqli->errno, $mysqli->error);
+						return false;
+				}
+			}
+		}
+		return true;
+	}
+
+	function func_mysqli_fetch_array_make_string($len) {
+
+		$ret = '';
+		for ($i = 0; $i < $len; $i++)
+			$ret .= chr(mt_rand(65, 90));
+
+		return $ret;
+	}
+
+	func_mysqli_fetch_array($mysqli, $engine, "TINYINT", -11, "-11", 20);
+	func_mysqli_fetch_array($mysqli, $engine, "TINYINT", NULL, NULL, 30);
+	func_mysqli_fetch_array($mysqli, $engine, "TINYINT UNSIGNED", 1, "1", 40);
+	func_mysqli_fetch_array($mysqli, $engine, "TINYINT UNSIGNED", NULL, NULL, 50);
+
+	func_mysqli_fetch_array($mysqli, $engine, "BOOL", 1, "1", 60);
+	func_mysqli_fetch_array($mysqli, $engine, "BOOL", NULL, NULL, 70);
+	func_mysqli_fetch_array($mysqli, $engine, "BOOLEAN", 0, "0", 80);
+	func_mysqli_fetch_array($mysqli, $engine, "BOOLEAN", NULL, NULL, 90);
+
+	func_mysqli_fetch_array($mysqli, $engine, "SMALLINT", -32768, "-32768", 100);
+	func_mysqli_fetch_array($mysqli, $engine, "SMALLINT", 32767, "32767", 110);
+	func_mysqli_fetch_array($mysqli, $engine, "SMALLINT", NULL, NULL, 120);
+	func_mysqli_fetch_array($mysqli, $engine, "SMALLINT UNSIGNED", 65535, "65535", 130);
+	func_mysqli_fetch_array($mysqli, $engine, "SMALLINT UNSIGNED", NULL, NULL, 140);
+
+	func_mysqli_fetch_array($mysqli, $engine, "MEDIUMINT", -8388608, "-8388608", 150);
+	func_mysqli_fetch_array($mysqli, $engine, "MEDIUMINT", 8388607, "8388607", 160);
+	func_mysqli_fetch_array($mysqli, $engine, "MEDIUMINT", NULL, NULL, 170);
+	func_mysqli_fetch_array($mysqli, $engine, "MEDIUMINT UNSIGNED", 16777215, "16777215",
180);
+	func_mysqli_fetch_array($mysqli, $engine, "MEDIUMINT UNSIGNED", NULL, NULL, 190);
+
+	func_mysqli_fetch_array($mysqli, $engine, "INTEGER", -2147483648, "-2147483648", 200);
+	func_mysqli_fetch_array($mysqli, $engine, "INTEGER", 2147483647, "2147483647", 210);
+	func_mysqli_fetch_array($mysqli, $engine, "INTEGER", NULL, NULL, 220);
+	func_mysqli_fetch_array($mysqli, $engine, "INTEGER UNSIGNED", 4294967295, "4294967295",
230);
+	func_mysqli_fetch_array($mysqli, $engine, "INTEGER UNSIGNED", NULL, NULL, 240);
+
+	if ($IS_MYSQLND ||
+		((mysqli_get_server_version($link) >= 51000) &&
+		 (mysqli_get_client_version($link) >= 51000))) {
+		func_mysqli_fetch_array($mysqli, $engine, "BIGINT", -9223372036854775808,
"-9223372036854775808", 250);
+		func_mysqli_fetch_array($mysqli, $engine, "BIGINT", NULL, NULL, 260);
+		func_mysqli_fetch_array($mysqli, $engine, "BIGINT UNSIGNED", 18446744073709551615,
"18446744073709551615", 270);
+		func_mysqli_fetch_array($mysqli, $engine, "BIGINT UNSIGNED", NULL, NULL, 280);
+	}
+
+	func_mysqli_fetch_array($mysqli, $engine, "FLOAT", -9223372036854775808 - 1.1,
"-9.22337e+18", 290, "/-9\.22337e\+[0]?18/iu");
+	func_mysqli_fetch_array($mysqli, $engine, "FLOAT", NULL, NULL, 300);
+	func_mysqli_fetch_array($mysqli, $engine, "FLOAT UNSIGNED", 18446744073709551615 + 1.1,
"1.84467e+19", 310, "/1\.84467e\+[0]?19/iu");
+	func_mysqli_fetch_array($mysqli, $engine, "FLOAT UNSIGNED ", NULL, NULL, 320);
+
+	func_mysqli_fetch_array($mysqli, $engine, "DOUBLE(10,2)", -99999999.99, "-99999999.99",
330);
+	func_mysqli_fetch_array($mysqli, $engine, "DOUBLE(10,2)", NULL, NULL, 340);
+	func_mysqli_fetch_array($mysqli, $engine, "DOUBLE(10,2) UNSIGNED", 99999999.99,
"99999999.99", 350);
+	func_mysqli_fetch_array($mysqli, $engine, "DOUBLE(10,2) UNSIGNED", NULL, NULL, 360);
+	func_mysqli_fetch_array($mysqli, $engine, "DECIMAL(10,2)", -99999999.99, "-99999999.99",
370);
+	func_mysqli_fetch_array($mysqli, $engine, "DECIMAL(10,2)", NULL, NULL, 380);
+	func_mysqli_fetch_array($mysqli, $engine, "DECIMAL(10,2)", 99999999.99, "99999999.99",
390);
+	func_mysqli_fetch_array($mysqli, $engine, "DECIMAL(10,2)", NULL, NULL, 400);
+
+	// don't care about date() strict TZ warnings...
 	$date = @date('Y-m-d');
-    func_mysqli_fetch_array($mysqli, $engine, "DATE",$date, $date, 410);
-    func_mysqli_fetch_array($mysqli, $engine, "DATE NOT NULL",$date, $date, 420);
-    func_mysqli_fetch_array($mysqli, $engine, "DATE", NULL, NULL, 430);
-    
-	$date = @date('Y-m-d H:i:s');
-    func_mysqli_fetch_array($mysqli, $engine, "DATETIME", $date, $date, 440);
-    func_mysqli_fetch_array($mysqli, $engine, "DATETIME NOT NULL", $date, $date, 450);
-    func_mysqli_fetch_array($mysqli, $engine, "DATETIME", NULL, NULL, 460);
-    
-    func_mysqli_fetch_array($mysqli, $engine, "TIMESTAMP", $date, $date, 470);
+	func_mysqli_fetch_array($mysqli, $engine, "DATE",$date, $date, 410);
+	func_mysqli_fetch_array($mysqli, $engine, "DATE NOT NULL",$date, $date, 420);
+	func_mysqli_fetch_array($mysqli, $engine, "DATE", NULL, NULL, 430);
 
+	$date = @date('Y-m-d H:i:s');
+	func_mysqli_fetch_array($mysqli, $engine, "DATETIME", $date, $date, 440);
+	func_mysqli_fetch_array($mysqli, $engine, "DATETIME NOT NULL", $date, $date, 450);
+	func_mysqli_fetch_array($mysqli, $engine, "DATETIME", NULL, NULL, 460);
+	func_mysqli_fetch_array($mysqli, $engine, "TIMESTAMP", $date, $date, 470);
 	$date = @date('H:i:s');
-    func_mysqli_fetch_array($mysqli, $engine, "TIME", $date, $date, 480);
-    func_mysqli_fetch_array($mysqli, $engine, "TIME NOT NULL", $date, $date, 490);
-    func_mysqli_fetch_array($mysqli, $engine, "TIME", NULL, NULL, 500);
-    
-    func_mysqli_fetch_array($mysqli, $engine, "YEAR", @date('Y'), @date('Y'), 510);
-    func_mysqli_fetch_array($mysqli, $engine, "YEAR NOT NULL", @date('Y'), @date('Y'),
520);
-    func_mysqli_fetch_array($mysqli, $engine, "YEAR", NULL, NULL, 530);
-    
-    $string255 = func_mysqli_fetch_array_make_string(255);
-        
-    func_mysqli_fetch_array($mysqli, $engine, "CHAR(1)", "a", "a", 540);
-    func_mysqli_fetch_array($mysqli, $engine, "CHAR(255)", $string255,  $string255, 550);
-    func_mysqli_fetch_array($mysqli, $engine, "CHAR(1) NOT NULL", "a", "a", 560);
-    func_mysqli_fetch_array($mysqli, $engine, "CHAR(1)", NULL, NULL, 570);
-    
-    $string65k = func_mysqli_fetch_array_make_string(65535);
-    
-    func_mysqli_fetch_array($mysqli, $engine, "VARCHAR(1)", "a", "a", 580);
-    func_mysqli_fetch_array($mysqli, $engine, "VARCHAR(255)", $string255, $string255,
590);
-    func_mysqli_fetch_array($mysqli, $engine, "VARCHAR(65635)", $string65k, $string65k,
600);
-    func_mysqli_fetch_array($mysqli, $engine, "VARCHAR(1) NOT NULL", "a", "a", 610);
-    func_mysqli_fetch_array($mysqli, $engine, "VARCHAR(1)", NULL, NULL, 620);
-    
-    func_mysqli_fetch_array($mysqli, $engine, "BINARY(1)", "a", "a", 630);
-    func_mysqli_fetch_array($mysqli, $engine, "BINARY(2)", chr(0) . "a", chr(0) . "a",
640);
-    func_mysqli_fetch_array($mysqli, $engine, "BINARY(1) NOT NULL", "b", "b", 650);
-    func_mysqli_fetch_array($mysqli, $engine, "BINARY(1)", NULL, NULL, 660);
-    
-    func_mysqli_fetch_array($mysqli, $engine, "VARBINARY(1)", "a", "a", 670);
-    func_mysqli_fetch_array($mysqli, $engine, "VARBINARY(2)", chr(0) . "a", chr(0) . "a",
680);
-    func_mysqli_fetch_array($mysqli, $engine, "VARBINARY(1) NOT NULL", "b", "b", 690);
-    func_mysqli_fetch_array($mysqli, $engine, "VARBINARY(1)", NULL, NULL, 700);
-    
-    func_mysqli_fetch_array($mysqli, $engine, "TINYBLOB", "a", "a", 710);
-    func_mysqli_fetch_array($mysqli, $engine, "TINYBLOB", chr(0) . "a", chr(0) . "a",
720);
-    func_mysqli_fetch_array($mysqli, $engine, "TINYBLOB NOT NULL", "b", "b", 730); 
-    func_mysqli_fetch_array($mysqli, $engine, "TINYBLOB", NULL, NULL, 740);
-    
-    func_mysqli_fetch_array($mysqli, $engine, "TINYTEXT", "a", "a", 750);
-    func_mysqli_fetch_array($mysqli, $engine, "TINYTEXT NOT NULL", "a", "a", 760);
-    func_mysqli_fetch_array($mysqli, $engine, "TINYTEXT", NULL, NULL, 770);
-    
-    func_mysqli_fetch_array($mysqli, $engine, "BLOB", "a", "a", 780);
-    func_mysqli_fetch_array($mysqli, $engine, "BLOB", chr(0) . "a", chr(0) . "a", 780);
-    func_mysqli_fetch_array($mysqli, $engine, "BLOB", NULL, NULL, 790);
-       
-    func_mysqli_fetch_array($mysqli, $engine, "TEXT", "a", "a", 800);
-    func_mysqli_fetch_array($mysqli, $engine, "TEXT", chr(0) . "a", chr(0) . "a", 810);
-    func_mysqli_fetch_array($mysqli, $engine, "TEXT", NULL, NULL, 820);
-    
-    func_mysqli_fetch_array($mysqli, $engine, "MEDIUMBLOB", "a", "a", 830);
-    func_mysqli_fetch_array($mysqli, $engine, "MEDIUMBLOB", chr(0) . "a", chr(0) . "a",
840);
-    func_mysqli_fetch_array($mysqli, $engine, "MEDIUMBLOB", NULL, NULL, 850);
-    
-    func_mysqli_fetch_array($mysqli, $engine, "MEDIUMTEXT", "a", "a", 860);
-    func_mysqli_fetch_array($mysqli, $engine, "MEDIUMTEXT", chr(0) . "a", chr(0) . "a",
870);
-    func_mysqli_fetch_array($mysqli, $engine, "MEDIUMTEXT", NULL, NULL, 880);
-    
-    func_mysqli_fetch_array($mysqli, $engine, "LONGBLOB", "a", "a", 890);
-    func_mysqli_fetch_array($mysqli, $engine, "LONGTEXT", chr(0) . "a", chr(0) . "a",
900);
-    func_mysqli_fetch_array($mysqli, $engine, "LONGBLOB", NULL, NULL, 910);
-    
-    func_mysqli_fetch_array($mysqli, $engine, "ENUM('a', 'b')", "a", "a", 920);
-    func_mysqli_fetch_array($mysqli, $engine, "ENUM('a', 'b')", NULL, NULL, 930);
-    
-    func_mysqli_fetch_array($mysqli, $engine, "SET('a', 'b')", "a", "a", 940);  
-    func_mysqli_fetch_array($mysqli, $engine, "SET('a', 'b')", NULL, NULL, 950);
-        
-    $mysqli->close();
-    
-    if (null !== ($tmp = $res->fetch_array(MYSQLI_ASSOC)))
-        printf("[015] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-        
-    print "done!";
+	func_mysqli_fetch_array($mysqli, $engine, "TIME", $date, $date, 480);
+	func_mysqli_fetch_array($mysqli, $engine, "TIME NOT NULL", $date, $date, 490);
+	func_mysqli_fetch_array($mysqli, $engine, "TIME", NULL, NULL, 500);
+	func_mysqli_fetch_array($mysqli, $engine, "YEAR", @date('Y'), @date('Y'), 510);
+	func_mysqli_fetch_array($mysqli, $engine, "YEAR NOT NULL", @date('Y'), @date('Y'), 520);
+	func_mysqli_fetch_array($mysqli, $engine, "YEAR", NULL, NULL, 530);
+
+	$string255 = func_mysqli_fetch_array_make_string(255);
+	func_mysqli_fetch_array($mysqli, $engine, "CHAR(1)", "a", "a", 540);
+	func_mysqli_fetch_array($mysqli, $engine, "CHAR(255)", $string255,  $string255, 550);
+	func_mysqli_fetch_array($mysqli, $engine, "CHAR(1) NOT NULL", "a", "a", 560);
+	func_mysqli_fetch_array($mysqli, $engine, "CHAR(1)", NULL, NULL, 570);
+
+	$string65k = func_mysqli_fetch_array_make_string(65535);
+	func_mysqli_fetch_array($mysqli, $engine, "VARCHAR(1)", "a", "a", 580);
+	func_mysqli_fetch_array($mysqli, $engine, "VARCHAR(255)", $string255, $string255, 590);
+	func_mysqli_fetch_array($mysqli, $engine, "VARCHAR(65635)", $string65k, $string65k,
600);
+	func_mysqli_fetch_array($mysqli, $engine, "VARCHAR(1) NOT NULL", "a", "a", 610);
+	func_mysqli_fetch_array($mysqli, $engine, "VARCHAR(1)", NULL, NULL, 620);
+
+	func_mysqli_fetch_array($mysqli, $engine, "BINARY(1)", "a", "a", 630);
+	func_mysqli_fetch_array($mysqli, $engine, "BINARY(2)", chr(0) . "a", chr(0) . "a", 640);
+	func_mysqli_fetch_array($mysqli, $engine, "BINARY(1) NOT NULL", "b", "b", 650);
+	func_mysqli_fetch_array($mysqli, $engine, "BINARY(1)", NULL, NULL, 660);
+
+	func_mysqli_fetch_array($mysqli, $engine, "VARBINARY(1)", "a", "a", 670);
+	func_mysqli_fetch_array($mysqli, $engine, "VARBINARY(2)", chr(0) . "a", chr(0) . "a",
680);
+	func_mysqli_fetch_array($mysqli, $engine, "VARBINARY(1) NOT NULL", "b", "b", 690);
+	func_mysqli_fetch_array($mysqli, $engine, "VARBINARY(1)", NULL, NULL, 700);
+
+	func_mysqli_fetch_array($mysqli, $engine, "TINYBLOB", "a", "a", 710);
+	func_mysqli_fetch_array($mysqli, $engine, "TINYBLOB", chr(0) . "a", chr(0) . "a", 720);
+	func_mysqli_fetch_array($mysqli, $engine, "TINYBLOB NOT NULL", "b", "b", 730);
+	func_mysqli_fetch_array($mysqli, $engine, "TINYBLOB", NULL, NULL, 740);
+
+	func_mysqli_fetch_array($mysqli, $engine, "TINYTEXT", "a", "a", 750);
+	func_mysqli_fetch_array($mysqli, $engine, "TINYTEXT NOT NULL", "a", "a", 760);
+	func_mysqli_fetch_array($mysqli, $engine, "TINYTEXT", NULL, NULL, 770);
+
+	func_mysqli_fetch_array($mysqli, $engine, "BLOB", "a", "a", 780);
+	func_mysqli_fetch_array($mysqli, $engine, "BLOB", chr(0) . "a", chr(0) . "a", 780);
+	func_mysqli_fetch_array($mysqli, $engine, "BLOB", NULL, NULL, 790);
+
+	func_mysqli_fetch_array($mysqli, $engine, "TEXT", "a", "a", 800);
+	func_mysqli_fetch_array($mysqli, $engine, "TEXT", chr(0) . "a", chr(0) . "a", 810);
+	func_mysqli_fetch_array($mysqli, $engine, "TEXT", NULL, NULL, 820);
+
+	func_mysqli_fetch_array($mysqli, $engine, "MEDIUMBLOB", "a", "a", 830);
+	func_mysqli_fetch_array($mysqli, $engine, "MEDIUMBLOB", chr(0) . "a", chr(0) . "a",
840);
+	func_mysqli_fetch_array($mysqli, $engine, "MEDIUMBLOB", NULL, NULL, 850);
+
+	func_mysqli_fetch_array($mysqli, $engine, "MEDIUMTEXT", "a", "a", 860);
+	func_mysqli_fetch_array($mysqli, $engine, "MEDIUMTEXT", chr(0) . "a", chr(0) . "a",
870);
+	func_mysqli_fetch_array($mysqli, $engine, "MEDIUMTEXT", NULL, NULL, 880);
+
+	func_mysqli_fetch_array($mysqli, $engine, "LONGBLOB", "a", "a", 890);
+	func_mysqli_fetch_array($mysqli, $engine, "LONGTEXT", chr(0) . "a", chr(0) . "a", 900);
+	func_mysqli_fetch_array($mysqli, $engine, "LONGBLOB", NULL, NULL, 910);
+
+	func_mysqli_fetch_array($mysqli, $engine, "ENUM('a', 'b')", "a", "a", 920);
+	func_mysqli_fetch_array($mysqli, $engine, "ENUM('a', 'b')", NULL, NULL, 930);
+
+	func_mysqli_fetch_array($mysqli, $engine, "SET('a', 'b')", "a", "a", 940);
+	func_mysqli_fetch_array($mysqli, $engine, "SET('a', 'b')", NULL, NULL, 950);
+
+	$mysqli->close();
+
+	if (null !== ($tmp = $res->fetch_array(MYSQLI_ASSOC)))
+		printf("[015] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+	print "done!";
 ?>
 --EXPECTF--
 [005]
@@ -355,7 +349,7 @@
 Warning: mysqli_result::fetch_array(): The result type should be either MYSQLI_NUM,
MYSQLI_ASSOC or MYSQLI_BOTH in %s on line %d
 
 Warning: mysqli_result::fetch_array(): Couldn't fetch mysqli_result in %s on line %d
-done! 
+done!
 --UEXPECTF--
 [005]
 array(4) {
@@ -435,4 +429,4 @@
 Warning: mysqli_result::fetch_array(): The result type should be either MYSQLI_NUM,
MYSQLI_ASSOC or MYSQLI_BOTH in %s on line %d
 
 Warning: mysqli_result::fetch_array(): Couldn't fetch mysqli_result in %s on line %d
-done! 
+done!
\ No newline at end of file

Modified: trunk/tests/ext/mysqli/mysqli_fetch_assoc_no_alias.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_fetch_assoc_no_alias.phpt	2007-07-17 12:36:34 UTC (rev
773)
+++ trunk/tests/ext/mysqli/mysqli_fetch_assoc_no_alias.phpt	2007-07-17 12:40:56 UTC (rev
774)
@@ -5,88 +5,80 @@
 <?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
-    include "connect.inc";    
-    require('table.inc');    
-        
-    if (!$res = mysqli_query($link, "SELECT 1, 2")) {
-        printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-    }
-    print "[002]\n";
-    var_dump(mysqli_fetch_assoc($res));
-    mysqli_free_result($res);
-    
+	include "connect.inc";
+	require('table.inc');
 
-    if (!$res = mysqli_query($link, "SELECT 1 AS a, 2")) {
-        printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-    }
-    print "[004]\n";
-    var_dump(mysqli_fetch_assoc($res));
-    mysqli_free_result($res);
-    
+	if (!$res = mysqli_query($link, "SELECT 1, 2")) {
+		printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+	}
+	print "[002]\n";
+	var_dump(mysqli_fetch_assoc($res));
+	mysqli_free_result($res);
 
-    if (!$res = mysqli_query($link, "SELECT 1 AS a, 2, 2 as '2'")) {
-        printf("[005] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-    }
-    print "[006]\n";
-    var_dump(mysqli_fetch_assoc($res));
-    mysqli_free_result($res);
-    
+	if (!$res = mysqli_query($link, "SELECT 1 AS a, 2")) {
+		printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+	}
+	print "[004]\n";
+	var_dump(mysqli_fetch_assoc($res));
+	mysqli_free_result($res);
 
-    if (!$res = mysqli_query($link, "SELECT 1 AS a, 2 as '2', 2")) {
-        printf("[007] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-    }
-    print "[008]\n";
-    var_dump(mysqli_fetch_assoc($res));
-    mysqli_free_result($res);
+	if (!$res = mysqli_query($link, "SELECT 1 AS a, 2, 2 as '2'")) {
+		printf("[005] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+	}
+	print "[006]\n";
+	var_dump(mysqli_fetch_assoc($res));
+	mysqli_free_result($res);
 
+	if (!$res = mysqli_query($link, "SELECT 1 AS a, 2 as '2', 2")) {
+		printf("[007] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+	}
+	print "[008]\n";
+	var_dump(mysqli_fetch_assoc($res));
+	mysqli_free_result($res);
 
 	/* Now do it with unbuffered queries */
+	if (!$res = mysqli_real_query($link, "SELECT 1, 2")) {
+		printf("[009] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+	}
+	if (!$res = mysqli_use_result($link)) {
+		printf("[010] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+	}
+	print "[011]\n";
+	var_dump(mysqli_fetch_assoc($res));
+	mysqli_free_result($res);
 
-    if (!$res = mysqli_real_query($link, "SELECT 1, 2")) {
-        printf("[009] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-    }
-    if (!$res = mysqli_use_result($link)) {
-        printf("[010] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-    }
-    print "[011]\n";
-    var_dump(mysqli_fetch_assoc($res));
-    mysqli_free_result($res);
+	if (!$res = mysqli_real_query($link, "SELECT 1 AS a, 2")) {
+		printf("[012] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+	}
+	if (!$res = mysqli_use_result($link)) {
+		printf("[013] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+	}
+	print "[014]\n";
+	var_dump(mysqli_fetch_assoc($res));
+	mysqli_free_result($res);
 
+	if (!$res = mysqli_real_query($link, "SELECT 1 AS a, 2, 2 as '2'")) {
+		printf("[015] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+	}
+	if (!$res = mysqli_use_result($link)) {
+		printf("[016] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+	}
+	print "[017]\n";
+	var_dump(mysqli_fetch_assoc($res));
+	mysqli_free_result($res);
 
-    if (!$res = mysqli_real_query($link, "SELECT 1 AS a, 2")) {
-        printf("[012] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-    }
-    if (!$res = mysqli_use_result($link)) {
-        printf("[013] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-    }
-    print "[014]\n";
-    var_dump(mysqli_fetch_assoc($res));
-    mysqli_free_result($res);
+	if (!$res = mysqli_real_query($link, "SELECT 1 AS a, 2 as '2', 2")) {
+		printf("[015] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+	}
+	if (!$res = mysqli_use_result($link)) {
+		printf("[016] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+	}
+	print "[017]\n";
+	var_dump(mysqli_fetch_assoc($res));
+	mysqli_free_result($res);
+	mysqli_close($link);
 
-
-    if (!$res = mysqli_real_query($link, "SELECT 1 AS a, 2, 2 as '2'")) {
-        printf("[015] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-    }
-    if (!$res = mysqli_use_result($link)) {
-        printf("[016] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-    }
-    print "[017]\n";
-    var_dump(mysqli_fetch_assoc($res));
-    mysqli_free_result($res);
-
-
-    if (!$res = mysqli_real_query($link, "SELECT 1 AS a, 2 as '2', 2")) {
-        printf("[015] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-    }
-    if (!$res = mysqli_use_result($link)) {
-        printf("[016] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-    }
-    print "[017]\n";
-    var_dump(mysqli_fetch_assoc($res));
-    mysqli_free_result($res);
-    mysqli_close($link);
-
-    print "done!";
+	print "done!";
 ?>
 --EXPECTF--
 [002]

Thread
PHP mysqlnd svn commit: r774 - trunk/tests/ext/mysqliuwendel17 Jul