cvs: php-src /ext/mysqli/tests 017.phpt 026.phpt 035.phpt 045.phpt

georg Mon Feb 16 10:32:48 2004 EDT Modified files: /php-src/ext/mysqli/tests 017.phpt 026.phpt 035.phpt 045.phpt Log: fixed some tests added skip section for prepared statements when using SHOW command http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/017.phpt?r1=1.3&r2=1.4&ty=u Index: php-src/ext/mysqli/tests/017.phpt diff -u php-src/ext/mysqli/tests/017.phpt:1.3 php-src/ext/mysqli/tests/017.phpt:1.4 --- php-src/ext/mysqli/tests/017.phpt:1.3 Wed Feb 11 02:39:28 2004 +++ php-src/ext/mysqli/tests/017.phpt Mon Feb 16 10:32:46 2004 @@ -22,9 +22,11 @@ mysqli_close($link); ?> --EXPECT-- -array(2) { +array(3) { [0]=> string(14) "root@localhost" [1]=> string(4) "test" + [2]=> + string(3) "foo" } http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/026.phpt?r1=1.3&r2=1.4&ty=u Index: php-src/ext/mysqli/tests/026.phpt diff -u php-src/ext/mysqli/tests/026.phpt:1.3 php-src/ext/mysqli/tests/026.phpt:1.4 --- php-src/ext/mysqli/tests/026.phpt:1.3 Wed Feb 11 02:39:28 2004 +++ php-src/ext/mysqli/tests/026.phpt Mon Feb 16 10:32:46 2004 @@ -19,9 +19,9 @@ $c1 = "Hello World"; - mysqli_send_long_data($stmt, 2, "This is the first sentence."); - mysqli_send_long_data($stmt, 2, " And this is the second sentence."); - mysqli_send_long_data($stmt, 2, " And finally this is the last sentence."); + mysqli_send_long_data($stmt, 1, "This is the first sentence."); + mysqli_send_long_data($stmt, 1, " And this is the second sentence."); + mysqli_send_long_data($stmt, 1, " And finally this is the last sentence."); mysqli_execute($stmt); mysqli_stmt_close($stmt); http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/035.phpt?r1=1.1&r2=1.2&ty=u Index: php-src/ext/mysqli/tests/035.phpt diff -u php-src/ext/mysqli/tests/035.phpt:1.1 php-src/ext/mysqli/tests/035.phpt:1.2 --- php-src/ext/mysqli/tests/035.phpt:1.1 Tue Feb 11 19:46:29 2003 +++ php-src/ext/mysqli/tests/035.phpt Mon Feb 16 10:32:46 2004 @@ -11,9 +11,9 @@ $sinfo = substr(mysqli_get_server_info($link),0,1); - var_dump($sinfo); + var_dump(strlen($sinfo)); mysqli_close($link); ?> --EXPECT-- -string(1) "4" +int(1) http://cvs.php.net/diff.php/php-src/ext/mysqli/tests/045.phpt?r1=1.2&r2=1.3&ty=u Index: php-src/ext/mysqli/tests/045.phpt diff -u php-src/ext/mysqli/tests/045.phpt:1.2 php-src/ext/mysqli/tests/045.phpt:1.3 --- php-src/ext/mysqli/tests/045.phpt:1.2 Sat Jun 28 17:30:58 2003 +++ php-src/ext/mysqli/tests/045.phpt Mon Feb 16 10:32:46 2004 @@ -1,5 +1,20 @@ --TEST-- mysqli_bind_result (SHOW) +--SKIPIF-- +<?php + include "connect.inc"; + $link = mysqli_connect("localhost", $user, $passwd); + + + $stmt = mysqli_prepare($link, "SHOW VARIABLES LIKE 'port'"); + mysqli_execute($stmt); + + if (!$stmt->field_count) { + printf("skip SHOW command is not supported in prepared statements."); + } + $stmt->close(); + mysqli_close($link); +?> --FILE-- <?php include "connect.inc"; @@ -8,8 +23,8 @@ $link = mysqli_connect("localhost", $user, $passwd); $stmt = mysqli_prepare($link, "SHOW VARIABLES LIKE 'port'"); - mysqli_execute($stmt); + mysqli_bind_result($stmt, $c1, $c2); mysqli_fetch($stmt); mysqli_stmt_close($stmt);