uw Wed Oct 10 10:07:08 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mysqli/tests 010.phpt 011.phpt 012.phpt 013.phpt 014.phpt 015.phpt 016.phpt 017.phpt 018.phpt 019.phpt Log: Changes to all 01*.phpt tests
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/010.phpt?r1=1.5.2.1&r2=1.5.2.1.4.1&diff_format=u Index: php-src/ext/mysqli/tests/010.phpt diff -u php-src/ext/mysqli/tests/010.phpt:1.5.2.1 php-src/ext/mysqli/tests/010.phpt:1.5.2.1.4.1 --- php-src/ext/mysqli/tests/010.phpt:1.5.2.1 Sat Oct 8 15:08:07 2005 +++ php-src/ext/mysqli/tests/010.phpt Wed Oct 10 10:07:08 2007 @@ -3,26 +3,32 @@ --INI-- precision=12 --SKIPIF-- -<?php require_once('skipif.inc'); ?> +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +?> --FILE-- <?php include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd); - - mysqli_select_db($link, "test"); - mysqli_query($link, "SET sql_mode=''"); + $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); - mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch"); + if (!mysqli_query($link, "SET sql_mode=''")) + printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 float(3), - c2 float, - c3 float unsigned, - c4 float, - c5 float, - c6 float, - c7 float(10) unsigned)"); + if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + + $rc = mysqli_query($link, "CREATE TABLE test_bind_fetch(c1 float(3), + c2 float, + c3 float unsigned, + c4 float, + c5 float, + c6 float, + c7 float(10) unsigned) ENGINE=" . $engine); + if (!$rc) + printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); mysqli_query($link, "INSERT INTO test_bind_fetch (c1,c2,c3,c4,c5,c6,c7) VALUES (3.1415926535,-0.000001, -5, 999999999999, @@ -39,6 +45,7 @@ mysqli_stmt_close($stmt); mysqli_close($link); + print "done!"; ?> --EXPECT-- array(7) { @@ -57,3 +64,4 @@ [6]=> float(888888914608000) } +done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/011.phpt?r1=1.5&r2=1.5.6.1&diff_format=u Index: php-src/ext/mysqli/tests/011.phpt diff -u php-src/ext/mysqli/tests/011.phpt:1.5 php-src/ext/mysqli/tests/011.phpt:1.5.6.1 --- php-src/ext/mysqli/tests/011.phpt:1.5 Sat Dec 4 08:50:33 2004 +++ php-src/ext/mysqli/tests/011.phpt Wed Oct 10 10:07:08 2007 @@ -3,27 +3,34 @@ --INI-- precision=12 --SKIPIF-- -<?php require_once('skipif.inc'); ?> +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +?> --FILE-- <?php include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd); - - mysqli_select_db($link, "test"); - - mysqli_query($link,"DROP TABLE IF EXISTS test_bind_result"); + $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); - mysqli_query($link,"CREATE TABLE test_bind_result(c1 tinyint, c2 smallint, - c3 int, c4 bigint, - c5 float, c6 double, - c7 varbinary(10), - c8 varchar(50))"); + if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result")) + printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - mysqli_query($link,"INSERT INTO test_bind_result VALUES(19,2999,3999,4999999, - 2345.6,5678.89563, - 'foobar','mysql rulez')"); + $rc = mysqli_query($link, "CREATE TABLE test_bind_result(c1 tinyint, c2 smallint, + c3 int, c4 bigint, + c5 float, c6 double, + c7 varbinary(10), + c8 varchar(50)) ENGINE=" . $engine); + if (!$rc) + printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + + $rc = mysqli_query($link,"INSERT INTO test_bind_result VALUES(19,2999,3999,4999999, + 2345.6,5678.89563, + 'foobar','mysql rulez')"); + if (!$rc) + printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_result"); mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7, $c8); mysqli_execute($stmt); @@ -35,8 +42,9 @@ mysqli_stmt_close($stmt); mysqli_close($link); + print "done!"; ?> ---EXPECT-- +--EXPECTF-- array(8) { [0]=> int(19) @@ -55,3 +63,24 @@ [7]=> string(11) "mysql rulez" } +done! +--UEXPECTF-- +array(8) { + [0]=> + int(19) + [1]=> + int(2999) + [2]=> + int(3999) + [3]=> + int(4999999) + [4]=> + float(2345.60009766) + [5]=> + float(5678.89563) + [6]=> + string(6) "foobar" + [7]=> + unicode(11) "mysql rulez" +} +done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/012.phpt?r1=1.5&r2=1.5.6.1&diff_format=u Index: php-src/ext/mysqli/tests/012.phpt diff -u php-src/ext/mysqli/tests/012.phpt:1.5 php-src/ext/mysqli/tests/012.phpt:1.5.6.1 --- php-src/ext/mysqli/tests/012.phpt:1.5 Sat Dec 4 08:50:33 2004 +++ php-src/ext/mysqli/tests/012.phpt Wed Oct 10 10:07:08 2007 @@ -3,27 +3,32 @@ --INI-- precision=12 --SKIPIF-- -<?php require_once('skipif.inc'); ?> +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +?> --FILE-- <?php include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd); - - mysqli_select_db($link, "test"); - mysqli_query($link,"DROP TABLE IF EXISTS test_bind_result"); + /*** test mysqli_connect 127.0.0.1 ***/ + $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); - mysqli_query($link,"CREATE TABLE test_bind_result(c1 tinyint, c2 smallint, - c3 int, c4 bigint, - c5 float, c6 double, - c7 varbinary(10), - c8 varchar(10))"); + if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result")) + printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - mysqli_query($link,"INSERT INTO test_bind_result VALUES(120,2999,3999,54, - 2.6,58.89, - '206','6.7')"); + $rc = mysqli_query($link, "CREATE TABLE test_bind_result(c1 tinyint, c2 smallint, + c3 int, c4 bigint, + c5 float, c6 double, + c7 varbinary(10), + c8 varchar(10)) ENGINE=" . $engine); + if (!$rc) + printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + + if (!mysqli_query($link, "INSERT INTO test_bind_result VALUES(120,2999,3999,54, + 2.6,58.89, + '206','6.7')")) + printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_result"); mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7, $c8); @@ -36,8 +41,9 @@ mysqli_stmt_close($stmt); mysqli_close($link); + print "done!"; ?> ---EXPECT-- +--EXPECTF-- array(8) { [0]=> int(120) @@ -56,3 +62,24 @@ [7]=> string(3) "6.7" } +done! +--UEXPECTF-- +array(8) { + [0]=> + int(120) + [1]=> + int(2999) + [2]=> + int(3999) + [3]=> + int(54) + [4]=> + float(2.59999990463) + [5]=> + float(58.89) + [6]=> + string(3) "206" + [7]=> + unicode(3) "6.7" +} +done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/013.phpt?r1=1.4.2.1.2.1&r2=1.4.2.1.2.1.2.1&diff_format=u Index: php-src/ext/mysqli/tests/013.phpt diff -u php-src/ext/mysqli/tests/013.phpt:1.4.2.1.2.1 php-src/ext/mysqli/tests/013.phpt:1.4.2.1.2.1.2.1 --- php-src/ext/mysqli/tests/013.phpt:1.4.2.1.2.1 Tue Jul 18 00:09:01 2006 +++ php-src/ext/mysqli/tests/013.phpt Wed Oct 10 10:07:08 2007 @@ -1,52 +1,60 @@ --TEST-- mysqli fetch mixed / mysql_query (may fail when using 4.1 library with 5.x server) --SKIPIF-- -<?php require_once('skipif.inc'); ?> +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +?> --FILE-- <?php include "connect.inc"; - - /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd); - mysqli_select_db($link, "test"); + /*** test mysqli_connect 127.0.0.1 ***/ + $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); - mysqli_query($link,"DROP TABLE IF EXISTS test_bind_result"); + if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result")) + printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - mysqli_query($link,"CREATE TABLE test_bind_result(c1 tinyint, c2 smallint, - c3 int, c4 bigint, - c5 decimal(4,2), c6 double, - c7 varbinary(10), - c8 varchar(10))"); + $rc = mysqli_query($link, "CREATE TABLE test_bind_result(c1 tinyint, c2 smallint, + c3 int, c4 bigint, + c5 decimal(4,2), c6 double, + c7 varbinary(10), + c8 varchar(10)) ENGINE=" . $engine); + if (!$rc) + printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + + if (!mysqli_query($link, "INSERT INTO test_bind_result VALUES(120,2999,3999,54, + 2.6,58.89, + '206','6.7')")) + printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - mysqli_query($link,"INSERT INTO test_bind_result VALUES(120,2999,3999,54, - 2.6,58.89, - '206','6.7')"); $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_result"); $c = array(0,0,0,0,0,0,0,0); $b_res= mysqli_bind_result($stmt, $c[0], $c[1], $c[2], $c[3], $c[4], $c[5], $c[6], $c[7]); mysqli_execute($stmt); - mysqli_fetch($stmt); - mysqli_fetch($stmt); + mysqli_fetch($stmt); + mysqli_fetch($stmt); mysqli_stmt_close($stmt); $result = mysqli_query($link, "select * from test_bind_result"); - $d = mysqli_fetch_row($result); + $d = mysqli_fetch_row($result); mysqli_free_result($result); $test = ""; for ($i=0; $i < count($c); $i++) - $test .= ($c[0] == $d[0]) ? "1" : "0"; + $test .= ($c[$i] == $d[$i]) ? "1" : "0"; if ($test == "11111111") - echo "ok"; + echo "ok\n"; else if ($b_res == FALSE && mysqli_get_client_version() > 40100 && mysqli_get_client_version() < 50000 && - mysqli_get_server_version($link) > 50000) + mysqli_get_server_version($link) > 50000) echo "error (4.1 library with 5.x server)"; else echo "error"; mysqli_close($link); + print "done!"; ?> --EXPECTF-- ok +done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/014.phpt?r1=1.8.2.2&r2=1.8.2.2.4.1&diff_format=u Index: php-src/ext/mysqli/tests/014.phpt diff -u php-src/ext/mysqli/tests/014.phpt:1.8.2.2 php-src/ext/mysqli/tests/014.phpt:1.8.2.2.4.1 --- php-src/ext/mysqli/tests/014.phpt:1.8.2.2 Thu Mar 30 20:43:39 2006 +++ php-src/ext/mysqli/tests/014.phpt Wed Oct 10 10:07:08 2007 @@ -1,12 +1,17 @@ --TEST-- -mysqli autocommit/commit/rollback +mysqli autocommit/commit/rollback --SKIPIF-- <?php require_once('skipif.inc'); + require_once('skipifconnectfailure.inc'); include "connect.inc"; - $link = mysqli_connect($host, $user, $passwd); - $result = mysqli_query($link, "SHOW VARIABLES LIKE 'have_innodb'"); - $row = mysqli_fetch_row($result); + $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + if (!$result = mysqli_query($link, "SHOW VARIABLES LIKE 'have_innodb'")) { + die("skip Cannot check for required InnoDB suppot"); + } + if (!$row = mysqli_fetch_row($result)) + die("skip Cannot check for required InnoDB suppot"); + mysqli_free_result($result); mysqli_close($link); if ($row[1] == "DISABLED" || $row[1] == "NO") { @@ -17,43 +22,66 @@ --FILE-- <?php include "connect.inc"; - $link = mysqli_connect($host, $user, $passwd); + $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + + if (!mysqli_autocommit($link, TRUE)) + printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + + if (!mysqli_query($link, "DROP TABLE IF EXISTS ac_01")) + printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + + if (!mysqli_query($link, "CREATE TABLE ac_01(a int, b varchar(10)) type=InnoDB")) + printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - mysqli_select_db($link, "test"); + if (!mysqli_query($link, "INSERT INTO ac_01 VALUES (1, 'foobar')")) + printf("[004] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - mysqli_autocommit($link, TRUE); + if (!mysqli_autocommit($link, FALSE)) + printf("[005] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - mysqli_query($link,"DROP TABLE IF EXISTS ac_01"); + if (!mysqli_query($link, "DELETE FROM ac_01")) + printf("[006] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - mysqli_query($link,"CREATE TABLE ac_01(a int, b varchar(10)) type=InnoDB"); + if (!mysqli_query($link, "INSERT INTO ac_01 VALUES (2, 'egon')")) + printf("[007] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - mysqli_query($link, "INSERT INTO ac_01 VALUES (1, 'foobar')"); - mysqli_autocommit($link, FALSE); - mysqli_query($link, "DELETE FROM ac_01"); - mysqli_query($link, "INSERT INTO ac_01 VALUES (2, 'egon')"); + if (!mysqli_rollback($link)) + printf("[008] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - mysqli_rollback($link); + if (!$result = mysqli_query($link, "SELECT * FROM ac_01")) + printf("[009] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - $result = mysqli_query($link, "SELECT * FROM ac_01"); printf("Num_of_rows=%d\n", mysqli_num_rows($result)); - $row = mysqli_fetch_row($result); + if (!$row = mysqli_fetch_row($result)) + printf("[010] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + mysqli_free_result($result); var_dump($row); - mysqli_query($link, "DELETE FROM ac_01"); - mysqli_query($link, "INSERT INTO ac_01 VALUES (2, 'egon')"); - mysqli_commit($link); + if (!mysqli_query($link, "DELETE FROM ac_01")) + printf("[011] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + + if (!mysqli_query($link, "INSERT INTO ac_01 VALUES (2, 'egon')")) + printf("[012] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + + if (!mysqli_commit($link)) + printf("[012] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + + if (!$result = mysqli_query($link, "SELECT * FROM ac_01")) + printf("[013] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + + if (!$row = mysqli_fetch_row($result)) + printf("[014] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - $result = mysqli_query($link, "SELECT * FROM ac_01"); - $row = mysqli_fetch_row($result); mysqli_free_result($result); var_dump($row); mysqli_close($link); + print "done!"; ?> ---EXPECT-- +--EXPECTF-- Num_of_rows=1 array(2) { [0]=> @@ -67,3 +95,19 @@ [1]=> string(4) "egon" } +done! +--UEXPECTF-- +Num_of_rows=1 +array(2) { + [0]=> + unicode(1) "1" + [1]=> + unicode(6) "foobar" +} +array(2) { + [0]=> + unicode(1) "2" + [1]=> + unicode(4) "egon" +} +done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/015.phpt?r1=1.4.2.1&r2=1.4.2.1.4.1&diff_format=u Index: php-src/ext/mysqli/tests/015.phpt diff -u php-src/ext/mysqli/tests/015.phpt:1.4.2.1 php-src/ext/mysqli/tests/015.phpt:1.4.2.1.4.1 --- php-src/ext/mysqli/tests/015.phpt:1.4.2.1 Thu Mar 30 20:43:39 2006 +++ php-src/ext/mysqli/tests/015.phpt Wed Oct 10 10:07:08 2007 @@ -1,15 +1,16 @@ --TEST-- -mysqli autocommit/commit/rollback with myisam +mysqli autocommit/commit/rollback with innodb --SKIPIF-- -<?php +<?php require_once('skipif.inc'); + require_once('skipifconnectfailure.inc'); include "connect.inc"; - $link = mysqli_connect($host, $user, $passwd); + $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); $result = mysqli_query($link, "SHOW VARIABLES LIKE 'have_innodb'"); $row = mysqli_fetch_row($result); mysqli_free_result($result); mysqli_close($link); - + if ($row[1] == "NO") { printf ("skip innodb support not installed."); } @@ -17,16 +18,16 @@ --FILE-- <?php include "connect.inc"; - - $link = mysqli_connect($host, $user, $passwd); - mysqli_select_db($link, "test"); + $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + + mysqli_select_db($link, $db); mysqli_autocommit($link, TRUE); mysqli_query($link,"DROP TABLE IF EXISTS ac_01"); - mysqli_query($link,"CREATE TABLE ac_01(a int, b varchar(10))"); + mysqli_query($link,"CREATE TABLE ac_01(a int, b varchar(10)) Engine=InnoDB"); mysqli_query($link, "INSERT INTO ac_01 VALUES (1, 'foobar')"); mysqli_autocommit($link, FALSE); @@ -36,7 +37,7 @@ mysqli_rollback($link); - $result = mysqli_query($link, "SELECT * FROM ac_01"); + $result = mysqli_query($link, "SELECT SQL_NO_CACHE * FROM ac_01"); $row = mysqli_fetch_row($result); mysqli_free_result($result); @@ -53,13 +54,14 @@ var_dump($row); mysqli_close($link); + print "done!"; ?> ---EXPECT-- +--EXPECTF-- array(2) { [0]=> - string(1) "2" + string(1) "1" [1]=> - string(4) "egon" + string(6) "foobar" } array(2) { [0]=> @@ -67,3 +69,18 @@ [1]=> string(4) "egon" } +done! +--UEXPECTF-- +array(2) { + [0]=> + unicode(1) "1" + [1]=> + unicode(6) "foobar" +} +array(2) { + [0]=> + unicode(1) "2" + [1]=> + unicode(4) "egon" +} +done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/016.phpt?r1=1.4&r2=1.4.6.1&diff_format=u Index: php-src/ext/mysqli/tests/016.phpt diff -u php-src/ext/mysqli/tests/016.phpt:1.4 php-src/ext/mysqli/tests/016.phpt:1.4.6.1 --- php-src/ext/mysqli/tests/016.phpt:1.4 Sat Dec 4 08:50:33 2004 +++ php-src/ext/mysqli/tests/016.phpt Wed Oct 10 10:07:08 2007 @@ -1,19 +1,23 @@ --TEST-- mysqli fetch user variable --SKIPIF-- -<?php require_once('skipif.inc'); ?> +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +?> --FILE-- <?php include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd); - - mysqli_select_db($link, "test"); + $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); - mysqli_query($link, "SET @dummy='foobar'"); + if (!mysqli_query($link, "SET @dummy='foobar'")) + printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - $stmt = mysqli_prepare($link, "SELECT @dummy"); + if (!$stmt = mysqli_prepare($link, "SELECT @dummy")) + printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + mysqli_bind_result($stmt, $dummy); mysqli_execute($stmt); mysqli_fetch($stmt); @@ -22,6 +26,11 @@ mysqli_stmt_close($stmt); mysqli_close($link); + print "done!"; ?> ---EXPECT-- +--EXPECTF-- string(6) "foobar" +done! +--UEXPECTF-- +unicode(6) "foobar" +done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/017.phpt?r1=1.7.2.1&r2=1.7.2.1.4.1&diff_format=u Index: php-src/ext/mysqli/tests/017.phpt diff -u php-src/ext/mysqli/tests/017.phpt:1.7.2.1 php-src/ext/mysqli/tests/017.phpt:1.7.2.1.4.1 --- php-src/ext/mysqli/tests/017.phpt:1.7.2.1 Fri Mar 24 10:58:52 2006 +++ php-src/ext/mysqli/tests/017.phpt Wed Oct 10 10:07:08 2007 @@ -1,18 +1,21 @@ --TEST-- mysqli fetch functions --SKIPIF-- -<?php require_once('skipif.inc'); ?> -<?php require_once('skipifemb.inc'); ?> +<?php +require_once('skipif.inc'); +require_once('skipifemb.inc'); +require_once('skipifconnectfailure.inc'); +?> --FILE-- <?php include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd); + $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); - mysqli_select_db($link, "test"); + if (!$stmt = mysqli_prepare($link, "SELECT md5('bar'), database(), 'foo'")) + printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - $stmt = mysqli_prepare($link, "SELECT md5('bar'), database(), 'foo'"); mysqli_bind_result($stmt, $c0, $c1, $c2); mysqli_execute($stmt); @@ -20,16 +23,31 @@ mysqli_stmt_close($stmt); $test = array($c0, $c1, $c2); + if ($c1 !== $db) { + echo "Different data\n"; + } var_dump($test); mysqli_close($link); + print "done!"; ?> ---EXPECT-- +--EXPECTF-- array(3) { [0]=> string(32) "37b51d194a7513e45b56f6524f2d51f2" [1]=> - string(4) "test" + string(%d) "%s" [2]=> string(3) "foo" } +done! +--UEXPECTF-- +array(3) { + [0]=> + string(32) "37b51d194a7513e45b56f6524f2d51f2" + [1]=> + unicode(%d) "%s" + [2]=> + unicode(3) "foo" +} +done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/018.phpt?r1=1.4&r2=1.4.6.1&diff_format=u Index: php-src/ext/mysqli/tests/018.phpt diff -u php-src/ext/mysqli/tests/018.phpt:1.4 php-src/ext/mysqli/tests/018.phpt:1.4.6.1 --- php-src/ext/mysqli/tests/018.phpt:1.4 Sat Dec 4 08:50:33 2004 +++ php-src/ext/mysqli/tests/018.phpt Wed Oct 10 10:07:08 2007 @@ -1,20 +1,24 @@ --TEST-- mysqli fetch system variables --SKIPIF-- -<?php require_once('skipif.inc'); ?> +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +?> --FILE-- <?php include "connect.inc"; - + /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd); + $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); - mysqli_select_db($link, "test"); + if (!mysqli_query($link, "SET AUTOCOMMIT=0")) + printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - mysqli_query($link, "SET AUTOCOMMIT=0"); + if (!$stmt = mysqli_prepare($link, "SELECT @@autocommit")) + printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - $stmt = mysqli_prepare($link, "SELECT @@autocommit"); - mysqli_bind_result($stmt, $c0); + mysqli_bind_result($stmt, $c0); mysqli_execute($stmt); mysqli_fetch($stmt); @@ -22,6 +26,8 @@ var_dump($c0); mysqli_close($link); + print "done!"; ?> --EXPECT-- int(0) +done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/019.phpt?r1=1.5.4.2&r2=1.5.4.2.2.1&diff_format=u Index: php-src/ext/mysqli/tests/019.phpt diff -u php-src/ext/mysqli/tests/019.phpt:1.5.4.2 php-src/ext/mysqli/tests/019.phpt:1.5.4.2.2.1 --- php-src/ext/mysqli/tests/019.phpt:1.5.4.2 Fri May 18 11:47:58 2007 +++ php-src/ext/mysqli/tests/019.phpt Wed Oct 10 10:07:08 2007 @@ -1,28 +1,33 @@ --TEST-- mysqli fetch (bind_param + bind_result) --SKIPIF-- -<?php require_once('skipif.inc'); ?> ---INI-- -precision=14 +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +?> --FILE-- <?php include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd); + $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); - mysqli_select_db($link, "test"); - $rc = mysqli_query($link,"DROP TABLE IF EXISTS insert_read"); + if (!mysqli_query($link, "DROP TABLE IF EXISTS insert_read")) + printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - $rc = mysqli_query($link,"CREATE TABLE insert_read(col1 tinyint, col2 smallint, - col3 int, col4 bigint, - col5 float, col6 double, - col7 date, col8 time, - col9 varbinary(10), - col10 varchar(50), - col11 char(20))"); + $rc = mysqli_query($link,"CREATE TABLE insert_read(col1 tinyint, col2 smallint, + col3 int, col4 bigint, + col5 float, col6 double, + col7 date, col8 time, + col9 varbinary(10), + col10 varchar(50), + col11 char(20)) ENGINE=" . $engine); + if (!$rc) + printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - $stmt= mysqli_prepare($link,"INSERT INTO insert_read(col1,col10, col11, col6) VALUES(?,?,?,?)"); + if (!$stmt = mysqli_prepare($link, "INSERT INTO insert_read(col1,col10, col11, col6) VALUES(?,?,?,?)")) + printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + mysqli_bind_param($stmt, "issd", $c1, $c2, $c3, $c4); $c1 = 1; @@ -33,7 +38,9 @@ mysqli_execute($stmt); mysqli_stmt_close($stmt); - $stmt = mysqli_prepare($link, "SELECT col1, col2, col3, col4, col5, col6, col7, col8, col9, col10, col11 from insert_read"); + if (!$stmt = mysqli_prepare($link, "SELECT col1, col2, col3, col4, col5, col6, col7, col8, col9, col10, col11 from insert_read")) + printf("[004] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7, $c8, $c9, $c10, $c11); mysqli_execute($stmt); @@ -45,8 +52,9 @@ mysqli_stmt_close($stmt); mysqli_close($link); + print "done!"; ?> ---EXPECT-- +--EXPECTF-- array(11) { [0]=> int(1) @@ -71,3 +79,30 @@ [10]=> string(6) "foobar" } +done! +--UEXPECTF-- +array(11) { + [0]=> + int(1) + [1]=> + NULL + [2]=> + NULL + [3]=> + NULL + [4]=> + NULL + [5]=> + float(3.14) + [6]=> + NULL + [7]=> + NULL + [8]=> + NULL + [9]=> + unicode(3) "foo" + [10]=> + unicode(6) "foobar" +} +done! \ No newline at end of file
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php