uw Thu, 17 Sep 2009 07:11:25 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=288396
Log: better coverage for mysqli_info Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_query_local_infile_large.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_query_local_infile_large.phpt Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_query_local_infile_large.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_query_local_infile_large.phpt 2009-09-17 05:02:35 UTC (rev 288395) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_query_local_infile_large.phpt 2009-09-17 07:11:25 UTC (rev 288396) @@ -5,6 +5,8 @@ require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> +--INI-- +mysqli.allow_local_infile=1 --FILE-- <?php // Create a large CVS file @@ -40,18 +42,22 @@ if (!mysqli_query($link, sprintf("LOAD DATA LOCAL INFILE '%s' INTO TABLE test FIELDS TERMINATED BY ';'", mysqli_real_escape_string($link, $file)))) printf("[004] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + if ((!is_string(mysqli_info($link))) || ('' == mysqli_info($link))) { + printf("[005] [%d] %s, mysqli_info not set \n", mysqli_errno($link), mysqli_error($link)); + } + if (!($res = mysqli_query($link, "SELECT COUNT(*) AS _num FROM test"))) - printf("[005] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + printf("[006] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); $row = mysqli_fetch_assoc($res); if (($row["_num"] != $rowno)) - printf("[006] Expecting %d rows, found %d\n", $rowno, $row["_num"]); + printf("[007] Expecting %d rows, found %d\n", $rowno, $row["_num"]); mysqli_free_result($res); $random = mt_rand(1, $rowno); if (!$res = mysqli_query($link, "SELECT id, col1, col2 FROM test WHERE id = " . $random)) - printf("[005] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + printf("[008] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); $row = mysqli_fetch_assoc($res); var_dump($row); Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_query_local_infile_large.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_query_local_infile_large.phpt 2009-09-17 05:02:35 UTC (rev 288395) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_query_local_infile_large.phpt 2009-09-17 07:11:25 UTC (rev 288396) @@ -5,6 +5,8 @@ require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> +--INI-- +mysqli.allow_local_infile=1 --FILE-- <?php // Create a large CVS file @@ -40,18 +42,22 @@ if (!mysqli_query($link, sprintf("LOAD DATA LOCAL INFILE '%s' INTO TABLE test FIELDS TERMINATED BY ';'", mysqli_real_escape_string($link, $file)))) printf("[004] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + if ((!is_string(mysqli_info($link))) || ('' == mysqli_info($link))) { + printf("[005] [%d] %s, mysqli_info not set \n", mysqli_errno($link), mysqli_error($link)); + } + if (!($res = mysqli_query($link, "SELECT COUNT(*) AS _num FROM test"))) - printf("[005] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + printf("[006] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); $row = mysqli_fetch_assoc($res); if (($row["_num"] != $rowno)) - printf("[006] Expecting %d rows, found %d\n", $rowno, $row["_num"]); + printf("[007] Expecting %d rows, found %d\n", $rowno, $row["_num"]); mysqli_free_result($res); $random = mt_rand(1, $rowno); if (!$res = mysqli_query($link, "SELECT id, col1, col2 FROM test WHERE id = " . $random)) - printf("[005] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + printf("[008] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); $row = mysqli_fetch_assoc($res); var_dump($row);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php