List:Commits« Previous MessageNext Message »
From:uwendel Date:July 20 2007 3:38pm
Subject:PHP mysqlnd svn commit: r813 - trunk/tests/ext/mysqli
View as plain text  
Author: uwendel
Date: 2007-07-20 17:38:09 +0200 (Fri, 20 Jul 2007)
New Revision: 813

Modified:
   trunk/tests/ext/mysqli/mysqli_stmt_send_long_data.phpt
   trunk/tests/ext/mysqli/mysqli_stmt_send_long_data_packet_size_libmysql.phpt
   trunk/tests/ext/mysqli/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt
   trunk/tests/ext/mysqli/mysqli_stmt_sqlstate.phpt
   trunk/tests/ext/mysqli/mysqli_stmt_store_result.phpt
Log:
Space2Tab for php.net


Modified: trunk/tests/ext/mysqli/mysqli_stmt_send_long_data.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_send_long_data.phpt	2007-07-20 15:23:45 UTC (rev
812)
+++ trunk/tests/ext/mysqli/mysqli_stmt_send_long_data.phpt	2007-07-20 15:38:09 UTC (rev
813)
@@ -5,119 +5,119 @@
 <?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
-    include "connect.inc";
-        
-    $tmp    = NULL;   
-    $link   = NULL;    
-    
-    if (!is_null($tmp = @mysqli_stmt_send_long_data()))
-        printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-        
-    if (!is_null($tmp = @mysqli_stmt_send_long_data($link)))
-        printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+	include "connect.inc";
 
-    require('table.inc');
-    
-    if (!$stmt = mysqli_stmt_init($link))
-        printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));      
-        
-    if (NULL !== ($tmp = @mysqli_stmt_send_long_data($stmt, '')))
-        printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-        
-    if (!mysqli_query($link, "DROP TABLE IF EXISTS test"))
-        printf("[005] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-        
-    if (!mysqli_query($link, sprintf("CREATE TABLE test(id INT NOT NULL AUTO_INCREMENT,
label LONGBLOB, PRIMARY KEY(id)) ENGINE = %s", $engine)))
-        printf("[006] [%d] %s\n", mysqli_errno($link), mysqli_error($link));        
-          
-    if (!mysqli_stmt_prepare($stmt, "INSERT INTO test(id, label) VALUES (?, ?)"))
-        printf("[007] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
-        
-    $id = null;
-    $label = null;
-    if (!mysqli_stmt_bind_param($stmt, "ib", $id, $label))
-        printf("[008] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+	$tmp    = NULL;
+	$link   = NULL;
 
-    if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "max_allowed_packet"'))
-        printf("[009] [%d] %s\n", mysqli_errno($link), mysqli_error($link));       
-        
-    if (!$row = mysqli_fetch_assoc($res))
-        printf("[010] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-        
-    mysqli_free_result($res);
-    
-    if (0 === ($max_allowed_packet = (int)$row['Value']))
-        printf("[011] Cannot determine max_allowed_packet size and/or bogus
max_allowed_packet setting used.\n");    
-    
-    // let's ignore upper limits for LONGBLOB (2^32) ...
-    // maximum packet size up to which we test is 10M
-    $tmp = '';
-    $blob = '';
-    for ($i = 0; $i < 1024; $i++) {
-        $tmp .= 'a';
-    }
-    
-    $limit = min(floor($max_allowed_packet / 1024 / 2), 10240);    
-    for ($i = 0; $i < $limit; $i++)
-        $blob .= $tmp;   
-    /*
-    if (floor($max_allowed_packet / 1024) <= 10240) {
-        $limit = strlen($blob) - $max_allowed_packet - 1;
-        for ($i = 0; $i < $limit; $i++)
-            $blob .= 'a';   
-    }
-    */
-    assert(strlen($blob) <= $max_allowed_packet);
-    
-    if (false !== ($tmp = mysqli_stmt_send_long_data($stmt, -1, $blob)))
-        printf("[012] Expecting boolean/false, got %s/%s. [%d] %s\n",
-            gettype($tmp), $tmp, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+	if (!is_null($tmp = @mysqli_stmt_send_long_data()))
+		printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
 
-    if (false !== ($tmp = mysqli_stmt_send_long_data($stmt, PHP_INT_MAX + 1, $blob)))
-        printf("[013] Expecting boolean/false, got %s/%s. [%d] %s\n",
-            gettype($tmp), $tmp, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt)); 
+	if (!is_null($tmp = @mysqli_stmt_send_long_data($link)))
+		printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
 
-    if (false !== ($tmp = mysqli_stmt_send_long_data($stmt, 999, $blob)))
-        printf("[014] Expecting boolean/false, got %s/%s. [%d] %s\n",
-            gettype($tmp), $tmp, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt)); 
-            
-    if (true !== ($tmp = mysqli_stmt_send_long_data($stmt, 1, $blob)))
-        printf("[015] Expecting boolean/true, got %s/%s. [%d] %s\n",
-            gettype($tmp), $tmp, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));    
+	require('table.inc');
 
-    $id = 1;
-    if (true !== mysqli_stmt_execute($stmt))
-        printf("[016] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));   
-    mysqli_stmt_close($stmt);
-    
-    if (!$res = mysqli_query($link, "SELECT id, label FROM test ORDER BY id"))
-        printf("[017] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-        
-    if (1 != ($tmp = mysqli_num_rows($res)))
-        printf("[018] Expecting 1 rows, mysqli_num_rows() reports %d rows. [%d] %s\n", 
-            $tmp, mysqli_errno($link), mysqli_error($link));           
-    
-    if (!$row = mysqli_fetch_assoc($res))
-        printf("[019] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-        
-    mysqli_free_result($res);
-        
-    if (empty($row['id']) || empty($row['label']) || ($row['id'] != 1))
-        printf("[020] Record seems to be incomplete\n");
-        
-    if ($blob != $row['label'])
-        printf("[021] Blob value has not been stored properly!\n");   
-    
-    if (NULL !== ($tmp = @mysqli_stmt_send_long_data($stmt, '')))
-        printf("[022] Expecting NULL, got %s/%s\n");
+	if (!$stmt = mysqli_stmt_init($link))
+		printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
-    /* Check that the function alias exists. It's a deprecated function, 
-    but we have not announce the removal so far, therefore we need to check for it */
-    if (!is_null($tmp = @mysqli_send_long_data()))
-        printf("[023] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-            
-    mysqli_close($link);    
-    print "done!";
+	if (NULL !== ($tmp = @mysqli_stmt_send_long_data($stmt, '')))
+		printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+	if (!mysqli_query($link, "DROP TABLE IF EXISTS test"))
+		printf("[005] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+
+	if (!mysqli_query($link, sprintf("CREATE TABLE test(id INT NOT NULL AUTO_INCREMENT,
label LONGBLOB, PRIMARY KEY(id)) ENGINE = %s", $engine)))
+		printf("[006] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+
+	if (!mysqli_stmt_prepare($stmt, "INSERT INTO test(id, label) VALUES (?, ?)"))
+		printf("[007] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+
+	$id = null;
+	$label = null;
+	if (!mysqli_stmt_bind_param($stmt, "ib", $id, $label))
+		printf("[008] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+
+	if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "max_allowed_packet"'))
+		printf("[009] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+
+	if (!$row = mysqli_fetch_assoc($res))
+		printf("[010] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+
+	mysqli_free_result($res);
+
+	if (0 === ($max_allowed_packet = (int)$row['Value']))
+		printf("[011] Cannot determine max_allowed_packet size and/or bogus max_allowed_packet
setting used.\n");
+
+	// let's ignore upper limits for LONGBLOB (2^32) ...
+	// maximum packet size up to which we test is 10M
+	$tmp = '';
+	$blob = '';
+	for ($i = 0; $i < 1024; $i++) {
+		$tmp .= 'a';
+	}
+
+	$limit = min(floor($max_allowed_packet / 1024 / 2), 10240);
+	for ($i = 0; $i < $limit; $i++)
+			$blob .= $tmp;
+	/*
+	if (floor($max_allowed_packet / 1024) <= 10240) {
+			$limit = strlen($blob) - $max_allowed_packet - 1;
+			for ($i = 0; $i < $limit; $i++)
+					$blob .= 'a';
+	}
+	*/
+	assert(strlen($blob) <= $max_allowed_packet);
+
+	if (false !== ($tmp = mysqli_stmt_send_long_data($stmt, -1, $blob)))
+		printf("[012] Expecting boolean/false, got %s/%s. [%d] %s\n",
+			gettype($tmp), $tmp, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+
+	if (false !== ($tmp = mysqli_stmt_send_long_data($stmt, PHP_INT_MAX + 1, $blob)))
+		printf("[013] Expecting boolean/false, got %s/%s. [%d] %s\n",
+			gettype($tmp), $tmp, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+
+	if (false !== ($tmp = mysqli_stmt_send_long_data($stmt, 999, $blob)))
+		printf("[014] Expecting boolean/false, got %s/%s. [%d] %s\n",
+			gettype($tmp), $tmp, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+
+	if (true !== ($tmp = mysqli_stmt_send_long_data($stmt, 1, $blob)))
+		printf("[015] Expecting boolean/true, got %s/%s. [%d] %s\n",
+			gettype($tmp), $tmp, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+
+	$id = 1;
+	if (true !== mysqli_stmt_execute($stmt))
+		printf("[016] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+	mysqli_stmt_close($stmt);
+
+	if (!$res = mysqli_query($link, "SELECT id, label FROM test ORDER BY id"))
+		printf("[017] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+
+	if (1 != ($tmp = mysqli_num_rows($res)))
+		printf("[018] Expecting 1 rows, mysqli_num_rows() reports %d rows. [%d] %s\n",
+			$tmp, mysqli_errno($link), mysqli_error($link));
+
+	if (!$row = mysqli_fetch_assoc($res))
+		printf("[019] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+
+	mysqli_free_result($res);
+
+	if (empty($row['id']) || empty($row['label']) || ($row['id'] != 1))
+		printf("[020] Record seems to be incomplete\n");
+
+	if ($blob != $row['label'])
+		printf("[021] Blob value has not been stored properly!\n");
+
+	if (NULL !== ($tmp = @mysqli_stmt_send_long_data($stmt, '')))
+		printf("[022] Expecting NULL, got %s/%s\n");
+
+	/* Check that the function alias exists. It's a deprecated function,
+	but we have not announce the removal so far, therefore we need to check for it */
+	if (!is_null($tmp = @mysqli_send_long_data()))
+		printf("[023] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+	mysqli_close($link);
+	print "done!";
 ?>
 --EXPECTF--
 Warning: mysqli_stmt_send_long_data(): Invalid parameter number in %s on line %d

Modified: trunk/tests/ext/mysqli/mysqli_stmt_send_long_data_packet_size_libmysql.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_send_long_data_packet_size_libmysql.phpt	2007-07-20
15:23:45 UTC (rev 812)
+++ trunk/tests/ext/mysqli/mysqli_stmt_send_long_data_packet_size_libmysql.phpt	2007-07-20
15:38:09 UTC (rev 813)
@@ -2,92 +2,92 @@
 mysqli_stmt_send_long_data() - exceed packet size, libmysql - bug #26824
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php 
-require_once('skipifemb.inc'); 
+<?php
+require_once('skipifemb.inc');
 if (stristr(mysqli_get_client_info(), 'mysqlnd'))
-    die("skip: test for libmysql");
+	die("skip: test for libmysql");
 ?>
 --FILE--
 <?php
-    include "connect.inc";
-    require('table.inc');       
-    
-    if (!$stmt = mysqli_stmt_init($link))
-        printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));   
-        
-    if (!mysqli_query($link, "DROP TABLE IF EXISTS test"))
-        printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-        
-    if (!mysqli_query($link, sprintf("CREATE TABLE test(id INT NOT NULL AUTO_INCREMENT,
label LONGBLOB, PRIMARY KEY(id)) ENGINE = %s", $engine)))
-        printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));        
-          
-    if (!mysqli_stmt_prepare($stmt, "INSERT INTO test(id, label) VALUES (?, ?)"))
-        printf("[004] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
-        
-    $id = null;
-    $label = null;
-    if (!mysqli_stmt_bind_param($stmt, "ib", $id, $label))
-        printf("[005] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+	include "connect.inc";
+	require('table.inc');
 
-    if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "max_allowed_packet"'))
-        printf("[006] [%d] %s\n", mysqli_errno($link), mysqli_error($link));       
-        
-    if (!$row = mysqli_fetch_assoc($res))
-        printf("[007] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-        
-    mysqli_free_result($res);
-    
-    if (0 === ($max_allowed_packet = (int)$row['Value']))
-        printf("[008] Cannot determine max_allowed_packet size and/or bogus
max_allowed_packet setting used.\n");    
-    
-    // let's ignore upper limits for LONGBLOB (2^32) ...
-    // maximum packet size up to which we test is 10M
-    $tmp = '';
-    $blob = '';
-    for ($i = 0; $i < 1024; $i++) {
-        $tmp .= 'a';
-    }
-    
-    $limit = min(floor($max_allowed_packet / 1024 / 2), 10240);    
-    for ($i = 0; $i < $limit; $i++)
-        $blob .= $tmp;   
-    
-    assert(strlen($blob) <= $max_allowed_packet);
-    
-    if (true != ($tmp = mysqli_stmt_send_long_data($stmt, 1, $blob)))
-        printf("[009] Expecting boolean/true, got %s/%s. [%d] %s\n",
-            gettype($tmp), $tmp, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));    
+	if (!$stmt = mysqli_stmt_init($link))
+		printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
-    $id = 1;
-    if (true !== mysqli_stmt_execute($stmt))
-        printf("[010] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));   
    
+	if (!mysqli_query($link, "DROP TABLE IF EXISTS test"))
+		printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
-    /*
-    TODO - we skip this part of the test for now, because of bugs.mysql.com/26824 
-    if (floor($max_allowed_packet / 1024 / 2) <= 10240) {
-        // test with a blob smaller than 10M allows us to test 
-        // for too long packages without wasting too much memory
-        $limit = $max_allowed_packet - strlen($blob) + 1;
-        $blob2 = $blob;
-        for ($i = 0; $i < $limit; $i++)
-            $blob2 .= 'b';
-            
-        assert(strlen($blob2) > $max_allowed_packet);            
-            
-        if (true != ($tmp = mysqli_stmt_send_long_data($stmt, 1, $blob2)))
-            printf("[011] Expecting boolean/false, got %s/%s. [%d] %s\n",
-                gettype($tmp), $tmp, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
-                            
-        $id = 2;
-        if (false !== ($tmp = mysqli_stmt_execute($stmt)))
-            printf("[012] Expecting boolean/false, got %s/%s, [%d] %s\n", 
-                gettype($tmp), $tmp, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
-    } 
-    */  
-    mysqli_stmt_close($stmt);            
-    mysqli_close($link); 
-       
-    print "done!";
+	if (!mysqli_query($link, sprintf("CREATE TABLE test(id INT NOT NULL AUTO_INCREMENT,
label LONGBLOB, PRIMARY KEY(id)) ENGINE = %s", $engine)))
+		printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+
+	if (!mysqli_stmt_prepare($stmt, "INSERT INTO test(id, label) VALUES (?, ?)"))
+		printf("[004] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+
+	$id = null;
+	$label = null;
+	if (!mysqli_stmt_bind_param($stmt, "ib", $id, $label))
+		printf("[005] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+
+	if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "max_allowed_packet"'))
+		printf("[006] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+
+	if (!$row = mysqli_fetch_assoc($res))
+		printf("[007] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+
+	mysqli_free_result($res);
+
+	if (0 === ($max_allowed_packet = (int)$row['Value']))
+		printf("[008] Cannot determine max_allowed_packet size and/or bogus max_allowed_packet
setting used.\n");
+
+	// let's ignore upper limits for LONGBLOB (2^32) ...
+	// maximum packet size up to which we test is 10M
+	$tmp = '';
+	$blob = '';
+	for ($i = 0; $i < 1024; $i++) {
+		$tmp .= 'a';
+	}
+
+	$limit = min(floor($max_allowed_packet / 1024 / 2), 10240);
+	for ($i = 0; $i < $limit; $i++)
+		$blob .= $tmp;
+
+	assert(strlen($blob) <= $max_allowed_packet);
+
+	if (true != ($tmp = mysqli_stmt_send_long_data($stmt, 1, $blob)))
+		printf("[009] Expecting boolean/true, got %s/%s. [%d] %s\n",
+			gettype($tmp), $tmp, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+
+	$id = 1;
+	if (true !== mysqli_stmt_execute($stmt))
+		printf("[010] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+
+	/*
+	TODO - we skip this part of the test for now, because of bugs.mysql.com/26824
+	if (floor($max_allowed_packet / 1024 / 2) <= 10240) {
+			// test with a blob smaller than 10M allows us to test
+			// for too long packages without wasting too much memory
+			$limit = $max_allowed_packet - strlen($blob) + 1;
+			$blob2 = $blob;
+			for ($i = 0; $i < $limit; $i++)
+					$blob2 .= 'b';
+
+			assert(strlen($blob2) > $max_allowed_packet);
+
+			if (true != ($tmp = mysqli_stmt_send_long_data($stmt, 1, $blob2)))
+					printf("[011] Expecting boolean/false, got %s/%s. [%d] %s\n",
+							gettype($tmp), $tmp, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+
+			$id = 2;
+			if (false !== ($tmp = mysqli_stmt_execute($stmt)))
+					printf("[012] Expecting boolean/false, got %s/%s, [%d] %s\n",
+							gettype($tmp), $tmp, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+	}
+	*/
+	mysqli_stmt_close($stmt);
+	mysqli_close($link);
+
+	print "done!";
 ?>
 --EXPECTF--
-done!
+done!
\ No newline at end of file

Modified: trunk/tests/ext/mysqli/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt	2007-07-20
15:23:45 UTC (rev 812)
+++ trunk/tests/ext/mysqli/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt	2007-07-20
15:38:09 UTC (rev 813)
@@ -2,98 +2,97 @@
 mysqli_stmt_send_long_data() - exceed packet size, mysqlnd
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php 
-require_once('skipifemb.inc'); 
+<?php
+require_once('skipifemb.inc');
 if (!stristr(mysqli_get_client_info(), 'mysqlnd'))
-    die("skip: warnings only available in mysqlnd");
-
+	die("skip: warnings only available in mysqlnd");
 ?>
 --FILE--
 <?php
-    include "connect.inc";
-    require('table.inc');       
-    
-    if (!$stmt = mysqli_stmt_init($link))
-        printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));   
-        
-    if (!mysqli_query($link, "DROP TABLE IF EXISTS test"))
-        printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-        
-    if (!mysqli_query($link, sprintf("CREATE TABLE test(id INT NOT NULL AUTO_INCREMENT,
label LONGBLOB, PRIMARY KEY(id)) ENGINE = %s", $engine)))
-        printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));        
-          
-    if (!mysqli_stmt_prepare($stmt, "INSERT INTO test(id, label) VALUES (?, ?)"))
-        printf("[004] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
-        
-    $id = null;
-    $label = null;
-    if (!mysqli_stmt_bind_param($stmt, "ib", $id, $label))
-        printf("[005] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+	include "connect.inc";
+	require('table.inc');
 
-    if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "max_allowed_packet"'))
-        printf("[006] [%d] %s\n", mysqli_errno($link), mysqli_error($link));       
-        
-    if (!$row = mysqli_fetch_assoc($res))
-        printf("[007] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-        
-    mysqli_free_result($res);
-    
-    if (0 === ($max_allowed_packet = (int)$row['Value']))
-        printf("[008] Cannot determine max_allowed_packet size and/or bogus
max_allowed_packet setting used.\n");    
-    
-    // let's ignore upper limits for LONGBLOB (2^32) ...
-    // maximum packet size up to which we test is 10M
-    $tmp = '';
-    $blob = '';
+	if (!$stmt = mysqli_stmt_init($link))
+		printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+
+	if (!mysqli_query($link, "DROP TABLE IF EXISTS test"))
+		printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+
+	if (!mysqli_query($link, sprintf("CREATE TABLE test(id INT NOT NULL AUTO_INCREMENT,
label LONGBLOB, PRIMARY KEY(id)) ENGINE = %s", $engine)))
+		printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+
+	if (!mysqli_stmt_prepare($stmt, "INSERT INTO test(id, label) VALUES (?, ?)"))
+		printf("[004] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+
+	$id = null;
+	$label = null;
+	if (!mysqli_stmt_bind_param($stmt, "ib", $id, $label))
+		printf("[005] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+
+	if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "max_allowed_packet"'))
+		printf("[006] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+
+	if (!$row = mysqli_fetch_assoc($res))
+		printf("[007] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+
+	mysqli_free_result($res);
+
+	if (0 === ($max_allowed_packet = (int)$row['Value']))
+		printf("[008] Cannot determine max_allowed_packet size and/or bogus max_allowed_packet
setting used.\n");
+
+	// let's ignore upper limits for LONGBLOB (2^32) ...
+	// maximum packet size up to which we test is 10M
+	$tmp = '';
+	$blob = '';
 	$tmp = str_repeat('a', 1024);
-    
-    $limit = min(floor($max_allowed_packet / 1024 / 2), 10240);
+
+	$limit = min(floor($max_allowed_packet / 1024 / 2), 10240);
 	$blob = str_repeat($tmp, $limit);
-    
-    assert(strlen($blob) <= $max_allowed_packet);
-    
-    if (true !== ($tmp = mysqli_stmt_send_long_data($stmt, 1, $blob)))
-        printf("[009] Expecting boolean/true, got %s/%s. [%d] %s\n",
-            gettype($tmp), $tmp, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));    
 
-    $id = 1;
-    if (true !== mysqli_stmt_execute($stmt))
-        printf("[010] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));   
    
-    
-    /*
-    TODO - we skip this because of the open bug http://bugs.mysql.com/bug.php?id=26824
-    It would always fail.
-    
-    This should be added to the EXPECTF, if you reactivate the test
+	assert(strlen($blob) <= $max_allowed_packet);
+
+	if (true !== ($tmp = mysqli_stmt_send_long_data($stmt, 1, $blob)))
+		printf("[009] Expecting boolean/true, got %s/%s. [%d] %s\n",
+			gettype($tmp), $tmp, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+
+	$id = 1;
+	if (true !== mysqli_stmt_execute($stmt))
+		printf("[010] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+
+		/*
+		TODO - we skip this because of the open bug http://bugs.mysql.com/bug.php?id=26824
+		It would always fail.
+
+		This should be added to the EXPECTF, if you reactivate the test
 Warning: mysqli_stmt_send_long_data(): Skipped %d bytes. Last command STMT_SEND_LONG_DATA
hasn't consumed all the output from the server in %s on line %d
 
 Warning: mysqli_stmt_send_long_data(): There was an error while sending long data.
Probably max_allowed_packet_size is smaller than the data. You have to increase it or
send smaller chunks of data. Answer was %d bytes long. in %s on line %d
 
-    
-    
-    if (floor($max_allowed_packet / 1024 / 2) <= 10240) {
-        // test with a blob smaller than 10M allows us to test 
-        // for too long packages without wasting too much memory
-        $limit = $max_allowed_packet - strlen($blob) + 1;
-        $blob2 = $blob;
+
+
+		if (floor($max_allowed_packet / 1024 / 2) <= 10240) {
+				// test with a blob smaller than 10M allows us to test
+				// for too long packages without wasting too much memory
+				$limit = $max_allowed_packet - strlen($blob) + 1;
+				$blob2 = $blob;
 		$blob2 .= str_repeat('b', $limit);
-            
-        assert(strlen($blob2) > $max_allowed_packet);            
-            
-        if (false !== ($tmp = mysqli_stmt_send_long_data($stmt, 1, $blob2)))
-            printf("[011] Expecting boolean/false, got %s/%s. [%d] %s\n",
-                gettype($tmp), $tmp, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
-                            
-        $id = 2;
-        if (false !== ($tmp = mysqli_stmt_execute($stmt)))
-            printf("[012] Expecting boolean/false, got %s/%s, [%d] %s\n", 
-                gettype($tmp), $tmp, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
-    }   
-    */
-    mysqli_stmt_close($stmt);            
-    mysqli_close($link); 
-       
-    print "done!";
+
+				assert(strlen($blob2) > $max_allowed_packet);
+
+				if (false !== ($tmp = mysqli_stmt_send_long_data($stmt, 1, $blob2)))
+						printf("[011] Expecting boolean/false, got %s/%s. [%d] %s\n",
+								gettype($tmp), $tmp, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+
+				$id = 2;
+				if (false !== ($tmp = mysqli_stmt_execute($stmt)))
+						printf("[012] Expecting boolean/false, got %s/%s, [%d] %s\n",
+								gettype($tmp), $tmp, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+		}
+		*/
+	mysqli_stmt_close($stmt);
+	mysqli_close($link);
+
+	print "done!";
 ?>
 --EXPECTF--
-done!
+done!
\ No newline at end of file

Modified: trunk/tests/ext/mysqli/mysqli_stmt_sqlstate.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_sqlstate.phpt	2007-07-20 15:23:45 UTC (rev 812)
+++ trunk/tests/ext/mysqli/mysqli_stmt_sqlstate.phpt	2007-07-20 15:38:09 UTC (rev 813)
@@ -5,52 +5,52 @@
 <?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
-    include "connect.inc";
-    
-    $tmp    = NULL;   
-    $link   = NULL;    
-    
-    if (!is_null($tmp = @mysqli_stmt_sqlstate()))
-        printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-        
-    if (!is_null($tmp = @mysqli_stmt_sqlstate($link)))
-        printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);       
+	include "connect.inc";
 
-    require('table.inc');
-    
-    if (!is_null($tmp = @mysqli_stmt_sqlstate($link, '')))
-        printf("[003] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-    
-    if (!$stmt = mysqli_stmt_init($link))
-        printf("[004] [%d] %s\n", mysqli_errno($link), mysqli_error($link));        
-               
-    if (NULL !== ($tmp = mysqli_stmt_sqlstate($stmt)))
-        printf("[005] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-        
-    if (!mysqli_stmt_prepare($stmt, "SELECT id FROM test"))
-        printf("[006] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
-        
-    if ('00000' !== ($tmp = mysqli_stmt_sqlstate($stmt)))
-        printf("[007] Expecting string/00000, got %s/%s. [%d] %s\n", 
-            gettype($tmp), $tmp, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
-        
-    if (mysqli_stmt_prepare($stmt, "SELECT believe_me FROM
i_dont_belive_that_this_table_exists"))
-        printf("[008] Should fail! [%d] %s\n", mysqli_stmt_errno($stmt),
mysqli_stmt_error($stmt));
-        
-    if ('' === ($tmp = mysqli_stmt_sqlstate($stmt)))
-        printf("[009] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));   
-                    
-    mysqli_stmt_close($stmt);
-    
-    if (NULL !== ($tmp = mysqli_stmt_sqlstate($stmt)))
-        printf("[010] Expecting NULL, got %s/%s\n");        
-            
-    mysqli_close($link);
-    print "done!";
+	$tmp    = NULL;
+	$link   = NULL;
+
+	if (!is_null($tmp = @mysqli_stmt_sqlstate()))
+		printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+	if (!is_null($tmp = @mysqli_stmt_sqlstate($link)))
+		printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+	require('table.inc');
+
+	if (!is_null($tmp = @mysqli_stmt_sqlstate($link, '')))
+		printf("[003] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+	if (!$stmt = mysqli_stmt_init($link))
+		printf("[004] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+
+	if (NULL !== ($tmp = mysqli_stmt_sqlstate($stmt)))
+		printf("[005] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+	if (!mysqli_stmt_prepare($stmt, "SELECT id FROM test"))
+		printf("[006] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+
+	if ('00000' !== ($tmp = mysqli_stmt_sqlstate($stmt)))
+		printf("[007] Expecting string/00000, got %s/%s. [%d] %s\n",
+			gettype($tmp), $tmp, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+
+	if (mysqli_stmt_prepare($stmt, "SELECT believe_me FROM
i_dont_belive_that_this_table_exists"))
+		printf("[008] Should fail! [%d] %s\n", mysqli_stmt_errno($stmt),
mysqli_stmt_error($stmt));
+
+	if ('' === ($tmp = mysqli_stmt_sqlstate($stmt)))
+		printf("[009] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+
+	mysqli_stmt_close($stmt);
+
+	if (NULL !== ($tmp = mysqli_stmt_sqlstate($stmt)))
+		printf("[010] Expecting NULL, got %s/%s\n");
+
+	mysqli_close($link);
+	print "done!";
 ?>
 --EXPECTF--
 Warning: mysqli_stmt_sqlstate(): invalid object or resource mysqli_stmt
  in %s on line %d
 
 Warning: mysqli_stmt_sqlstate(): Couldn't fetch mysqli_stmt in %s on line %d
-done! 
+done!
\ No newline at end of file

Modified: trunk/tests/ext/mysqli/mysqli_stmt_store_result.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_stmt_store_result.phpt	2007-07-20 15:23:45 UTC (rev 812)
+++ trunk/tests/ext/mysqli/mysqli_stmt_store_result.phpt	2007-07-20 15:38:09 UTC (rev 813)
@@ -1,85 +1,85 @@
 --TEST--
 mysqli_stmt_store_result()
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
-require_once('skipifemb.inc'); 
+<?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
 ?>
 --FILE--
 <?php
-    include "connect.inc";
-    
-    $tmp    = NULL;   
-    $link   = NULL;    
-    
-    if (!is_null($tmp = @mysqli_stmt_store_result()))
-        printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-        
-    if (!is_null($tmp = @mysqli_stmt_store_result($link)))
-        printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);      
-        
-    require('table.inc');    
-    
-    if (!is_null($tmp = @mysqli_stmt_store_result(new mysqli_stmt())))
-        printf("[003] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-    
-    if (!$stmt = mysqli_stmt_init($link))
-        printf("[004] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-        
-    // stmt object status test
-    if (NULL !== ($tmp = @mysqli_stmt_store_result($stmt)))
-        printf("[005] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-        
-    if (!mysqli_stmt_prepare($stmt, 'INSERT INTO test(id, label) VALUES (100, "z")') ||
-        !mysqli_stmt_execute($stmt))
-        printf("[006] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+	include "connect.inc";
 
-    if (true !== ($tmp = @mysqli_stmt_store_result($stmt)))
-        printf("[007] Expecting boolean/true, got %s/%s\n", gettype($tmp), $tmp);
+	$tmp    = NULL;
+	$link   = NULL;
 
-    if (!mysqli_stmt_prepare($stmt, 'SELECT id, label FROM test ORDER BY id') ||
-        !mysqli_stmt_execute($stmt))
-        printf("[008] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
-        
-    if (!$link_buf = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-        printf("[009] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
-        
-    if (!$stmt_buf = mysqli_stmt_init($link_buf))
-        printf("[010] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-    
-    if (!mysqli_stmt_prepare($stmt_buf, "SELECT id, label FROM test ORDER BY id") ||
-        !mysqli_stmt_execute($stmt_buf))
-        printf("[011] [%d] %s\n", mysqli_stmt_errno($stmt_buf),
mysqli_stmt_error($stmt_buf));
-        
-    $id = $label = $id_buf = $label_buf = null;    
-    if (!mysqli_stmt_bind_result($stmt, $id, $label))
-        printf("[012] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
-        
-    if (!mysqli_stmt_bind_result($stmt_buf, $id_buf, $label_buf))
-        printf("[013] [%d] %s\n", mysqli_stmt_errno($stmt_buf),
mysqli_stmt_error($stmt_buf));
-        
-    while (mysqli_stmt_fetch($stmt)) {
-        if (!mysqli_stmt_fetch($stmt_buf)) {
-            printf("[014] Unbuffered statement indicates more rows than buffered, [%d]
%s\n",
-                mysqli_stmt_errno($stmt_buf), mysqli_stmt_error($stmt_buf));            
-        }
-        if ($id !== $id_buf)
-            printf("[015] unbuffered '%s'/%s, buffered '%s'/%s\n", 
-                $id, gettype($id), $id_buf, gettype($id_buf));
-        if ($label !== $label_buf)
-            printf("[016] unbuffered '%s'/%s, buffered '%s'/%s\n",
-                $label, gettype($label), $label_buf, gettype($label_buf));
-    }
-            
-    mysqli_stmt_close($stmt);
-    mysqli_stmt_close($stmt_buf);
-    
-    if (NULL !== ($tmp = @mysqli_stmt_store_result($stmt)))
-        printf("[017] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-        
-    mysqli_close($link);
-    mysqli_close($link_buf);
-    print "done!";
+	if (!is_null($tmp = @mysqli_stmt_store_result()))
+		printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+	if (!is_null($tmp = @mysqli_stmt_store_result($link)))
+		printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+	require('table.inc');
+
+	if (!is_null($tmp = @mysqli_stmt_store_result(new mysqli_stmt())))
+		printf("[003] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+	if (!$stmt = mysqli_stmt_init($link))
+		printf("[004] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+
+	// stmt object status test
+	if (NULL !== ($tmp = @mysqli_stmt_store_result($stmt)))
+		printf("[005] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+	if (!mysqli_stmt_prepare($stmt, 'INSERT INTO test(id, label) VALUES (100, "z")') ||
+		!mysqli_stmt_execute($stmt))
+		printf("[006] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+
+	if (true !== ($tmp = @mysqli_stmt_store_result($stmt)))
+		printf("[007] Expecting boolean/true, got %s/%s\n", gettype($tmp), $tmp);
+
+	if (!mysqli_stmt_prepare($stmt, 'SELECT id, label FROM test ORDER BY id') ||
+		!mysqli_stmt_execute($stmt))
+		printf("[008] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+
+	if (!$link_buf = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+		printf("[009] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
+
+	if (!$stmt_buf = mysqli_stmt_init($link_buf))
+		printf("[010] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+
+	if (!mysqli_stmt_prepare($stmt_buf, "SELECT id, label FROM test ORDER BY id") ||
+		!mysqli_stmt_execute($stmt_buf))
+		printf("[011] [%d] %s\n", mysqli_stmt_errno($stmt_buf), mysqli_stmt_error($stmt_buf));
+
+	$id = $label = $id_buf = $label_buf = null;
+	if (!mysqli_stmt_bind_result($stmt, $id, $label))
+		printf("[012] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+
+	if (!mysqli_stmt_bind_result($stmt_buf, $id_buf, $label_buf))
+		printf("[013] [%d] %s\n", mysqli_stmt_errno($stmt_buf), mysqli_stmt_error($stmt_buf));
+
+	while (mysqli_stmt_fetch($stmt)) {
+		if (!mysqli_stmt_fetch($stmt_buf)) {
+			printf("[014] Unbuffered statement indicates more rows than buffered, [%d] %s\n",
+				mysqli_stmt_errno($stmt_buf), mysqli_stmt_error($stmt_buf));
+		}
+		if ($id !== $id_buf)
+			printf("[015] unbuffered '%s'/%s, buffered '%s'/%s\n",
+				$id, gettype($id), $id_buf, gettype($id_buf));
+		if ($label !== $label_buf)
+			printf("[016] unbuffered '%s'/%s, buffered '%s'/%s\n",
+				$label, gettype($label), $label_buf, gettype($label_buf));
+	}
+
+	mysqli_stmt_close($stmt);
+	mysqli_stmt_close($stmt_buf);
+
+	if (NULL !== ($tmp = @mysqli_stmt_store_result($stmt)))
+		printf("[017] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+	mysqli_close($link);
+	mysqli_close($link_buf);
+	print "done!";
 ?>
 --EXPECTF--
-done! 
+done!
\ No newline at end of file

Thread
PHP mysqlnd svn commit: r813 - trunk/tests/ext/mysqliuwendel20 Jul