diff options
Diffstat (limited to 'ext/mysqli/tests')
160 files changed, 160 insertions, 160 deletions
diff --git a/ext/mysqli/tests/002.phpt b/ext/mysqli/tests/002.phpt index aaece46faf..5a8dcae0c1 100644 --- a/ext/mysqli/tests/002.phpt +++ b/ext/mysqli/tests/002.phpt @@ -57,7 +57,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_fetch_null")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(11) { [0]=> int(1) diff --git a/ext/mysqli/tests/003.phpt b/ext/mysqli/tests/003.phpt index 63d5b43cfc..2e2089d4b2 100644 --- a/ext/mysqli/tests/003.phpt +++ b/ext/mysqli/tests/003.phpt @@ -83,7 +83,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(7) { [0]=> string(10) "2002-01-02" diff --git a/ext/mysqli/tests/004.phpt b/ext/mysqli/tests/004.phpt index 4896a786a8..ad58e7af27 100644 --- a/ext/mysqli/tests/004.phpt +++ b/ext/mysqli/tests/004.phpt @@ -61,7 +61,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> string(10) "1234567890" diff --git a/ext/mysqli/tests/005.phpt b/ext/mysqli/tests/005.phpt index e433351e01..cbb1cccf96 100644 --- a/ext/mysqli/tests/005.phpt +++ b/ext/mysqli/tests/005.phpt @@ -51,7 +51,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> string(10) "1234567890" diff --git a/ext/mysqli/tests/009.phpt b/ext/mysqli/tests/009.phpt index e82ca65859..7807929348 100644 --- a/ext/mysqli/tests/009.phpt +++ b/ext/mysqli/tests/009.phpt @@ -92,7 +92,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch_uint")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(8) { [0]=> int(5) diff --git a/ext/mysqli/tests/011.phpt b/ext/mysqli/tests/011.phpt index 3b93b0a207..1792fec6a2 100644 --- a/ext/mysqli/tests/011.phpt +++ b/ext/mysqli/tests/011.phpt @@ -56,7 +56,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(8) { [0]=> int(19) diff --git a/ext/mysqli/tests/012.phpt b/ext/mysqli/tests/012.phpt index ebf8d76daf..2d8c6500ec 100644 --- a/ext/mysqli/tests/012.phpt +++ b/ext/mysqli/tests/012.phpt @@ -55,7 +55,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(8) { [0]=> int(120) diff --git a/ext/mysqli/tests/013.phpt b/ext/mysqli/tests/013.phpt index 6d75bde731..421899d10a 100644 --- a/ext/mysqli/tests/013.phpt +++ b/ext/mysqli/tests/013.phpt @@ -67,6 +67,6 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- ok done!
\ No newline at end of file diff --git a/ext/mysqli/tests/014.phpt b/ext/mysqli/tests/014.phpt index 30044dc4fb..2015f2ef6a 100644 --- a/ext/mysqli/tests/014.phpt +++ b/ext/mysqli/tests/014.phpt @@ -80,7 +80,7 @@ mysqli autocommit/commit/rollback <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- Num_of_rows=1 array(2) { [0]=> diff --git a/ext/mysqli/tests/015.phpt b/ext/mysqli/tests/015.phpt index 227a142d6a..de950b00f7 100644 --- a/ext/mysqli/tests/015.phpt +++ b/ext/mysqli/tests/015.phpt @@ -78,7 +78,7 @@ mysqli autocommit/commit/rollback with innodb <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> string(1) "1" diff --git a/ext/mysqli/tests/016.phpt b/ext/mysqli/tests/016.phpt index 143143c8f5..60170a727e 100644 --- a/ext/mysqli/tests/016.phpt +++ b/ext/mysqli/tests/016.phpt @@ -28,6 +28,6 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> ---EXPECTF-- +--EXPECT-- string(6) "foobar" done!
\ No newline at end of file diff --git a/ext/mysqli/tests/019.phpt b/ext/mysqli/tests/019.phpt index 3c5530c03a..06f03c0cf1 100644 --- a/ext/mysqli/tests/019.phpt +++ b/ext/mysqli/tests/019.phpt @@ -66,7 +66,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS insert_read")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(11) { [0]=> int(1) diff --git a/ext/mysqli/tests/021.phpt b/ext/mysqli/tests/021.phpt index 6076529959..2011ae630d 100644 --- a/ext/mysqli/tests/021.phpt +++ b/ext/mysqli/tests/021.phpt @@ -49,7 +49,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> string(10) "1234567890" diff --git a/ext/mysqli/tests/026.phpt b/ext/mysqli/tests/026.phpt index 997dee6517..14b8dcbdba 100644 --- a/ext/mysqli/tests/026.phpt +++ b/ext/mysqli/tests/026.phpt @@ -55,7 +55,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> string(10) "Hello Worl" diff --git a/ext/mysqli/tests/032.phpt b/ext/mysqli/tests/032.phpt index d773defb26..d6427e7815 100644 --- a/ext/mysqli/tests/032.phpt +++ b/ext/mysqli/tests/032.phpt @@ -37,6 +37,6 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS general_test")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- string(38) "Records: 3 Duplicates: 0 Warnings: 0" done!
\ No newline at end of file diff --git a/ext/mysqli/tests/043.phpt b/ext/mysqli/tests/043.phpt index c3a9901e4f..964e38330e 100644 --- a/ext/mysqli/tests/043.phpt +++ b/ext/mysqli/tests/043.phpt @@ -51,7 +51,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_update")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> string(15) "Rasmus is No. 1" diff --git a/ext/mysqli/tests/048.phpt b/ext/mysqli/tests/048.phpt index bd2625ad61..6f55d03716 100644 --- a/ext/mysqli/tests/048.phpt +++ b/ext/mysqli/tests/048.phpt @@ -51,7 +51,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_fetch_null")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(11) { [0]=> int(1) diff --git a/ext/mysqli/tests/058.phpt b/ext/mysqli/tests/058.phpt index 3d268749b9..0c75488dd6 100644 --- a/ext/mysqli/tests/058.phpt +++ b/ext/mysqli/tests/058.phpt @@ -59,7 +59,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS mbind")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(4) { [0]=> int(1) diff --git a/ext/mysqli/tests/059.phpt b/ext/mysqli/tests/059.phpt index d6e9d6ed55..a05acb825b 100644 --- a/ext/mysqli/tests/059.phpt +++ b/ext/mysqli/tests/059.phpt @@ -52,6 +52,6 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS mbind")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- string(6) "foobar" done!
\ No newline at end of file diff --git a/ext/mysqli/tests/061.phpt b/ext/mysqli/tests/061.phpt index a6a0c4f205..8c5b6aa23c 100644 --- a/ext/mysqli/tests/061.phpt +++ b/ext/mysqli/tests/061.phpt @@ -70,7 +70,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS t_061")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- foo-bar string-string rab-oof diff --git a/ext/mysqli/tests/062.phpt b/ext/mysqli/tests/062.phpt index bfb7ea35bf..fa02853a19 100644 --- a/ext/mysqli/tests/062.phpt +++ b/ext/mysqli/tests/062.phpt @@ -22,7 +22,7 @@ require_once('skipifconnectfailure.inc'); var_dump($row); print "done!"; ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> string(3) "foo" diff --git a/ext/mysqli/tests/063.phpt b/ext/mysqli/tests/063.phpt index da6708c0ac..c4852ac91d 100644 --- a/ext/mysqli/tests/063.phpt +++ b/ext/mysqli/tests/063.phpt @@ -20,5 +20,5 @@ require_once('skipifconnectfailure.inc'); var_dump($foo); ?> ---EXPECTF-- +--EXPECT-- string(3) "foo"
\ No newline at end of file diff --git a/ext/mysqli/tests/068.phpt b/ext/mysqli/tests/068.phpt index 78f710db8c..0d7899d177 100644 --- a/ext/mysqli/tests/068.phpt +++ b/ext/mysqli/tests/068.phpt @@ -7,5 +7,5 @@ mysqli get_client_info $s = mysqli_get_client_info(); echo gettype($s); ?> ---EXPECTF-- +--EXPECT-- string
\ No newline at end of file diff --git a/ext/mysqli/tests/069.phpt b/ext/mysqli/tests/069.phpt index c83cbc3c16..c195173188 100644 --- a/ext/mysqli/tests/069.phpt +++ b/ext/mysqli/tests/069.phpt @@ -26,7 +26,7 @@ require_once('skipifconnectfailure.inc'); $mysql->close(); print "done!"; ?> ---EXPECTF-- +--EXPECT-- array(1) { [1]=> string(1) "1" diff --git a/ext/mysqli/tests/074.phpt b/ext/mysqli/tests/074.phpt index 7b4590f99c..b790f62839 100644 --- a/ext/mysqli/tests/074.phpt +++ b/ext/mysqli/tests/074.phpt @@ -21,7 +21,7 @@ require_once('skipifconnectfailure.inc'); var_dump($result->fetch_row()); ?> ---EXPECTF-- +--EXPECT-- bool(true) array(1) { [0]=> diff --git a/ext/mysqli/tests/bug29311.phpt b/ext/mysqli/tests/bug29311.phpt index cd7b9ef009..cfd5235e2b 100644 --- a/ext/mysqli/tests/bug29311.phpt +++ b/ext/mysqli/tests/bug29311.phpt @@ -47,5 +47,5 @@ require_once('skipifconnectfailure.inc'); } print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/bug30967.phpt b/ext/mysqli/tests/bug30967.phpt index 48007cee6c..9af81ea12a 100644 --- a/ext/mysqli/tests/bug30967.phpt +++ b/ext/mysqli/tests/bug30967.phpt @@ -22,5 +22,5 @@ require_once('skipifconnectfailure.inc'); $mysql->close(); ?> ---EXPECTF-- +--EXPECT-- 1064 diff --git a/ext/mysqli/tests/bug33263.phpt b/ext/mysqli/tests/bug33263.phpt index ac2de197bb..33c5dbbc56 100644 --- a/ext/mysqli/tests/bug33263.phpt +++ b/ext/mysqli/tests/bug33263.phpt @@ -33,5 +33,5 @@ require_once('skipifconnectfailure.inc'); $mysql->close(); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/bug35517.phpt b/ext/mysqli/tests/bug35517.phpt index c40035d9c8..78b3206af4 100644 --- a/ext/mysqli/tests/bug35517.phpt +++ b/ext/mysqli/tests/bug35517.phpt @@ -45,7 +45,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS temp")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- 3000000897 3800001532 3900002281 diff --git a/ext/mysqli/tests/bug38710.phpt b/ext/mysqli/tests/bug38710.phpt index c3bb7285c8..b5baf19442 100644 --- a/ext/mysqli/tests/bug38710.phpt +++ b/ext/mysqli/tests/bug38710.phpt @@ -20,5 +20,5 @@ if ($text !== str_repeat('a', ($IS_MYSQLND || mysqli_get_server_version($db) > 5 } echo "Done"; ?> ---EXPECTF-- +--EXPECT-- Done
\ No newline at end of file diff --git a/ext/mysqli/tests/bug42378.phpt b/ext/mysqli/tests/bug42378.phpt index f3bbe346fa..1c75141306 100644 --- a/ext/mysqli/tests/bug42378.phpt +++ b/ext/mysqli/tests/bug42378.phpt @@ -184,7 +184,7 @@ memory_limit=83886080 <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- FLOAT FORMAT(col1, 0) FLOAT diff --git a/ext/mysqli/tests/bug44897.phpt b/ext/mysqli/tests/bug44897.phpt index 84c245d0fc..89853a3acf 100644 --- a/ext/mysqli/tests/bug44897.phpt +++ b/ext/mysqli/tests/bug44897.phpt @@ -85,5 +85,5 @@ mysqli_query($link, "DROP PROCEDURE IF EXISTS p"); mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/bug45019.phpt b/ext/mysqli/tests/bug45019.phpt index b4c115d4cc..f7ace737d8 100644 --- a/ext/mysqli/tests/bug45019.phpt +++ b/ext/mysqli/tests/bug45019.phpt @@ -51,7 +51,7 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- Using CAST('somestring' AS CHAR)... string(3) "one" string(5) "three" diff --git a/ext/mysqli/tests/bug46109.phpt b/ext/mysqli/tests/bug46109.phpt index c377171b7b..a1c77ac2d8 100644 --- a/ext/mysqli/tests/bug46109.phpt +++ b/ext/mysqli/tests/bug46109.phpt @@ -14,5 +14,5 @@ require_once('skipifconnectfailure.inc'); $mysqli->init(); echo "done"; ?> ---EXPECTF-- +--EXPECT-- done diff --git a/ext/mysqli/tests/bug48909.phpt b/ext/mysqli/tests/bug48909.phpt index 76901390cb..94bf4236dc 100644 --- a/ext/mysqli/tests/bug48909.phpt +++ b/ext/mysqli/tests/bug48909.phpt @@ -42,5 +42,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done
\ No newline at end of file diff --git a/ext/mysqli/tests/bug49027.phpt b/ext/mysqli/tests/bug49027.phpt index 55b74ce017..059d986584 100644 --- a/ext/mysqli/tests/bug49027.phpt +++ b/ext/mysqli/tests/bug49027.phpt @@ -50,7 +50,7 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- array(1) { [0]=> string(2) "42" diff --git a/ext/mysqli/tests/bug49442.phpt b/ext/mysqli/tests/bug49442.phpt index dce7b33cb7..f20cbb1b11 100644 --- a/ext/mysqli/tests/bug49442.phpt +++ b/ext/mysqli/tests/bug49442.phpt @@ -108,7 +108,7 @@ mysqli.max_persistent=1 <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- array(2) { ["id"]=> string(2) "97" diff --git a/ext/mysqli/tests/bug50772.phpt b/ext/mysqli/tests/bug50772.phpt index eecef84ad2..6d0ee6c24c 100644 --- a/ext/mysqli/tests/bug50772.phpt +++ b/ext/mysqli/tests/bug50772.phpt @@ -30,7 +30,7 @@ require_once('skipifconnectfailure.inc'); } echo "done\n"; ?> ---EXPECTF-- +--EXPECT-- ok 1 ok 2 done
\ No newline at end of file diff --git a/ext/mysqli/tests/bug51605.phpt b/ext/mysqli/tests/bug51605.phpt index 02328a5be8..c57a7b36d3 100644 --- a/ext/mysqli/tests/bug51605.phpt +++ b/ext/mysqli/tests/bug51605.phpt @@ -37,7 +37,7 @@ mysqli.reconnect = Off print "done!"; ?> ---EXPECTF-- +--EXPECT-- closed once closed twice closed for third time diff --git a/ext/mysqli/tests/bug52082.phpt b/ext/mysqli/tests/bug52082.phpt index 8e3bd59ba5..815f79013a 100644 --- a/ext/mysqli/tests/bug52082.phpt +++ b/ext/mysqli/tests/bug52082.phpt @@ -22,7 +22,7 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> string(20) "character_set_client" diff --git a/ext/mysqli/tests/bug52891.phpt b/ext/mysqli/tests/bug52891.phpt index 463efd6d4e..7e4758887f 100644 --- a/ext/mysqli/tests/bug52891.phpt +++ b/ext/mysqli/tests/bug52891.phpt @@ -114,7 +114,7 @@ if (!mysqli_query($link, 'DROP TABLE IF EXISTS tsint')) { mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- tsint: array(1) { ["a"]=> diff --git a/ext/mysqli/tests/bug54221.phpt b/ext/mysqli/tests/bug54221.phpt index 78c9a2c40e..b031909aa2 100644 --- a/ext/mysqli/tests/bug54221.phpt +++ b/ext/mysqli/tests/bug54221.phpt @@ -41,7 +41,7 @@ mysqli.reconnect = Off print "done!"; ?> ---EXPECTF-- +--EXPECT-- Warning: : Warning: 1050: Table 't54221' already exists done! diff --git a/ext/mysqli/tests/bug54674.phpt b/ext/mysqli/tests/bug54674.phpt index efc67308b6..e18eed7f99 100644 --- a/ext/mysqli/tests/bug54674.phpt +++ b/ext/mysqli/tests/bug54674.phpt @@ -26,6 +26,6 @@ mysqli.reconnect = Off print "done!"; ?> ---EXPECTF-- +--EXPECT-- bool(true) done! diff --git a/ext/mysqli/tests/bug55283.phpt b/ext/mysqli/tests/bug55283.phpt index a10c604fdd..6ea62065b9 100644 --- a/ext/mysqli/tests/bug55283.phpt +++ b/ext/mysqli/tests/bug55283.phpt @@ -59,7 +59,7 @@ $link->close(); echo "done\n"; ?> ---EXPECTF-- +--EXPECT-- array(2) { [0]=> string(10) "Ssl_cipher" diff --git a/ext/mysqli/tests/bug66043.phpt b/ext/mysqli/tests/bug66043.phpt index 52e42b6177..54ddf6943c 100644 --- a/ext/mysqli/tests/bug66043.phpt +++ b/ext/mysqli/tests/bug66043.phpt @@ -22,5 +22,5 @@ $stmt->execute(); $stmt->bind_result($testArg); echo "Okey"; ?> ---EXPECTF-- +--EXPECT-- Okey diff --git a/ext/mysqli/tests/bug66124.phpt b/ext/mysqli/tests/bug66124.phpt index 8c0027f9e6..9cb5f45726 100644 --- a/ext/mysqli/tests/bug66124.phpt +++ b/ext/mysqli/tests/bug66124.phpt @@ -91,7 +91,7 @@ if ($result){ $link->close(); ?> done ---EXPECTF-- +--EXPECT-- Using 'i': insert id:1311200011005001566=>1311200011005001566 fetch id:1311200011005001566 diff --git a/ext/mysqli/tests/bug67839.phpt b/ext/mysqli/tests/bug67839.phpt index 58b2d2fa82..f36c2bf6e7 100644 --- a/ext/mysqli/tests/bug67839.phpt +++ b/ext/mysqli/tests/bug67839.phpt @@ -64,5 +64,5 @@ precision=5 <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- 1: 9.9999: 9.9999 diff --git a/ext/mysqli/tests/bug68077.phpt b/ext/mysqli/tests/bug68077.phpt index 0652e68c9b..f9fb962e77 100644 --- a/ext/mysqli/tests/bug68077.phpt +++ b/ext/mysqli/tests/bug68077.phpt @@ -74,7 +74,7 @@ $link->close(); unlink('bug53503.data'); ?> ---EXPECTF-- +--EXPECT-- done [006] [2000] open_basedir restriction in effect. Unable to open file done diff --git a/ext/mysqli/tests/bug70384.phpt b/ext/mysqli/tests/bug70384.phpt index aa8662badf..6987789d36 100644 --- a/ext/mysqli/tests/bug70384.phpt +++ b/ext/mysqli/tests/bug70384.phpt @@ -58,5 +58,5 @@ mysqli_float_handling - ensure 4 byte float is handled correctly <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- OK
\ No newline at end of file diff --git a/ext/mysqli/tests/bug72489.phpt b/ext/mysqli/tests/bug72489.phpt index 4e8fb3f4e5..744a504c8d 100644 --- a/ext/mysqli/tests/bug72489.phpt +++ b/ext/mysqli/tests/bug72489.phpt @@ -60,6 +60,6 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS bug72489")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- Finished 1 Finished 2 diff --git a/ext/mysqli/tests/bug73462.phpt b/ext/mysqli/tests/bug73462.phpt index 6de73761f4..5fb978feb1 100644 --- a/ext/mysqli/tests/bug73462.phpt +++ b/ext/mysqli/tests/bug73462.phpt @@ -37,5 +37,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/bug73949.phpt b/ext/mysqli/tests/bug73949.phpt index 7ce311eb77..9de75ecd2b 100644 --- a/ext/mysqli/tests/bug73949.phpt +++ b/ext/mysqli/tests/bug73949.phpt @@ -20,5 +20,5 @@ $t=array(new stdClass); while($db= mysqli_fetch_object($res,'cc',$t)){} print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/bug74547.phpt b/ext/mysqli/tests/bug74547.phpt index a771c9a852..940357ad04 100644 --- a/ext/mysqli/tests/bug74547.phpt +++ b/ext/mysqli/tests/bug74547.phpt @@ -20,6 +20,6 @@ Bug #74547 mysqli::change_user() doesn't accept null as $database argument w/str mysqli_close($link); ?> ===DONE=== ---EXPECTF-- +--EXPECT-- bool(true) ===DONE=== diff --git a/ext/mysqli/tests/mysqli_affected_rows.phpt b/ext/mysqli/tests/mysqli_affected_rows.phpt index a08f897ef9..95c3bb3426 100644 --- a/ext/mysqli/tests/mysqli_affected_rows.phpt +++ b/ext/mysqli/tests/mysqli_affected_rows.phpt @@ -131,5 +131,5 @@ mysqli_affected_rows() <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_affected_rows_oo.phpt b/ext/mysqli/tests/mysqli_affected_rows_oo.phpt index 2b9b549cb4..7a6a5be996 100644 --- a/ext/mysqli/tests/mysqli_affected_rows_oo.phpt +++ b/ext/mysqli/tests/mysqli_affected_rows_oo.phpt @@ -110,5 +110,5 @@ mysqli->affected_rows <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_autocommit.phpt b/ext/mysqli/tests/mysqli_autocommit.phpt index fdbedc5fb6..cc41786bdb 100644 --- a/ext/mysqli/tests/mysqli_autocommit.phpt +++ b/ext/mysqli/tests/mysqli_autocommit.phpt @@ -143,5 +143,5 @@ mysqli_autocommit() <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_autocommit_oo.phpt b/ext/mysqli/tests/mysqli_autocommit_oo.phpt index 5f61915e20..7c616aab50 100644 --- a/ext/mysqli/tests/mysqli_autocommit_oo.phpt +++ b/ext/mysqli/tests/mysqli_autocommit_oo.phpt @@ -133,5 +133,5 @@ mysqli->autocommit() <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_change_user.phpt b/ext/mysqli/tests/mysqli_change_user.phpt index a7ae1d6690..7b9f23cf9e 100644 --- a/ext/mysqli/tests/mysqli_change_user.phpt +++ b/ext/mysqli/tests/mysqli_change_user.phpt @@ -144,5 +144,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_change_user_insert_id.phpt b/ext/mysqli/tests/mysqli_change_user_insert_id.phpt index 7d1c398142..00fa9f0af6 100644 --- a/ext/mysqli/tests/mysqli_change_user_insert_id.phpt +++ b/ext/mysqli/tests/mysqli_change_user_insert_id.phpt @@ -61,5 +61,5 @@ if (!$IS_MYSQLND) { <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt b/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt index e40154ce10..fa8c66f56b 100644 --- a/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt +++ b/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt @@ -103,5 +103,5 @@ die("skip - is the server still buggy?"); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_change_user_old.phpt b/ext/mysqli/tests/mysqli_change_user_old.phpt index 96357ebf51..cf53016f59 100644 --- a/ext/mysqli/tests/mysqli_change_user_old.phpt +++ b/ext/mysqli/tests/mysqli_change_user_old.phpt @@ -123,5 +123,5 @@ if (mysqli_get_server_version($link) >= 50600) print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_change_user_oo.phpt b/ext/mysqli/tests/mysqli_change_user_oo.phpt index 34a3e51bb1..5203381088 100644 --- a/ext/mysqli/tests/mysqli_change_user_oo.phpt +++ b/ext/mysqli/tests/mysqli_change_user_oo.phpt @@ -88,5 +88,5 @@ if (mysqli_get_server_version($link) >= 50600) print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt b/ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt index 6a37b6b44a..577673f0b5 100644 --- a/ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt +++ b/ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt @@ -29,5 +29,5 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_change_user_rollback.phpt b/ext/mysqli/tests/mysqli_change_user_rollback.phpt index ed3330e064..12370b18cc 100644 --- a/ext/mysqli/tests/mysqli_change_user_rollback.phpt +++ b/ext/mysqli/tests/mysqli_change_user_rollback.phpt @@ -66,5 +66,5 @@ if (!have_innodb($link)) <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_change_user_set_names.phpt b/ext/mysqli/tests/mysqli_change_user_set_names.phpt index 0adaf52b85..614aa7a023 100644 --- a/ext/mysqli/tests/mysqli_change_user_set_names.phpt +++ b/ext/mysqli/tests/mysqli_change_user_set_names.phpt @@ -153,5 +153,5 @@ if ($version[0] <= 4 && $version[1] < 1) mysqli_close($link); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_character_set.phpt b/ext/mysqli/tests/mysqli_character_set.phpt index 82be2c4683..855141e40d 100644 --- a/ext/mysqli/tests/mysqli_character_set.phpt +++ b/ext/mysqli/tests/mysqli_character_set.phpt @@ -103,5 +103,5 @@ if (!function_exists('mysqli_set_charset')) { <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_character_set_name.phpt b/ext/mysqli/tests/mysqli_character_set_name.phpt index 8d21b561e0..90dd46fa73 100644 --- a/ext/mysqli/tests/mysqli_character_set_name.phpt +++ b/ext/mysqli/tests/mysqli_character_set_name.phpt @@ -71,5 +71,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_character_set_name_oo.phpt b/ext/mysqli/tests/mysqli_character_set_name_oo.phpt index 1a81bdcb39..5d303fd503 100644 --- a/ext/mysqli/tests/mysqli_character_set_name_oo.phpt +++ b/ext/mysqli/tests/mysqli_character_set_name_oo.phpt @@ -66,5 +66,5 @@ mysqli_chararcter_set_name(), mysql_client_encoding() [alias] print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt b/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt index db1d3444c7..9247721e43 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt @@ -24,7 +24,7 @@ if ($MYSQLND_VERSION < 50004) inspectClass($class); print "done!\n"; ?> ---EXPECTF-- +--EXPECT-- Inspecting class 'mysqli' isInternal: yes isUserDefined: no diff --git a/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt b/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt index 75a8e8cfcb..ee2765c4dc 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt @@ -24,7 +24,7 @@ if ($MYSQLND_VERSION < 50004) inspectClass($class); print "done!"; ?> ---EXPECTF-- +--EXPECT-- Inspecting class 'mysqli_result' isInternal: yes isUserDefined: no diff --git a/ext/mysqli/tests/mysqli_close.phpt b/ext/mysqli/tests/mysqli_close.phpt index 937137564e..a300fb8314 100644 --- a/ext/mysqli/tests/mysqli_close.phpt +++ b/ext/mysqli/tests/mysqli_close.phpt @@ -36,5 +36,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_close_oo.phpt b/ext/mysqli/tests/mysqli_close_oo.phpt index 49189bbab1..305d5edf88 100644 --- a/ext/mysqli/tests/mysqli_close_oo.phpt +++ b/ext/mysqli/tests/mysqli_close_oo.phpt @@ -32,5 +32,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_commit.phpt b/ext/mysqli/tests/mysqli_commit.phpt index ea64ae8065..27ae3a928a 100644 --- a/ext/mysqli/tests/mysqli_commit.phpt +++ b/ext/mysqli/tests/mysqli_commit.phpt @@ -73,5 +73,5 @@ if (!have_innodb($link)) <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_connect_errno.phpt b/ext/mysqli/tests/mysqli_connect_errno.phpt index a7f90f1527..c2d22ee8ea 100644 --- a/ext/mysqli/tests/mysqli_connect_errno.phpt +++ b/ext/mysqli/tests/mysqli_connect_errno.phpt @@ -36,5 +36,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_connect_error.phpt b/ext/mysqli/tests/mysqli_connect_error.phpt index 79ac3f1f79..dca311ea93 100644 --- a/ext/mysqli/tests/mysqli_connect_error.phpt +++ b/ext/mysqli/tests/mysqli_connect_error.phpt @@ -35,5 +35,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt index 7f049b052f..d60ff3876a 100644 --- a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt +++ b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt @@ -156,7 +156,7 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- array(1) { ["testing"]=> string(19) "mysqli.default_port" diff --git a/ext/mysqli/tests/mysqli_connect_twice.phpt b/ext/mysqli/tests/mysqli_connect_twice.phpt index 2809a3feda..97ca40c61c 100644 --- a/ext/mysqli/tests/mysqli_connect_twice.phpt +++ b/ext/mysqli/tests/mysqli_connect_twice.phpt @@ -72,7 +72,7 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- array(1) { ["it_works"]=> string(2) "ok" diff --git a/ext/mysqli/tests/mysqli_constants.phpt b/ext/mysqli/tests/mysqli_constants.phpt index 42113aef2b..6f1cd5faa7 100644 --- a/ext/mysqli/tests/mysqli_constants.phpt +++ b/ext/mysqli/tests/mysqli_constants.phpt @@ -237,5 +237,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_constants_categories.phpt b/ext/mysqli/tests/mysqli_constants_categories.phpt index e51325a213..28aaa582ad 100644 --- a/ext/mysqli/tests/mysqli_constants_categories.phpt +++ b/ext/mysqli/tests/mysqli_constants_categories.phpt @@ -20,5 +20,5 @@ require_once('skipifemb.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_debug_ini.phpt b/ext/mysqli/tests/mysqli_debug_ini.phpt index bcf00672d6..d644bf9204 100644 --- a/ext/mysqli/tests/mysqli_debug_ini.phpt +++ b/ext/mysqli/tests/mysqli_debug_ini.phpt @@ -48,6 +48,6 @@ mysqlnd.debug="t:O,/tmp/mysqli_debug_phpt.trace" print "done!"; ?> ---EXPECTF-- +--EXPECT-- string(32) "t:O,/tmp/mysqli_debug_phpt.trace" done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt b/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt index f46aec9359..333aaa10c0 100644 --- a/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt +++ b/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt @@ -128,5 +128,5 @@ if (!$IS_MYSQLND) <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_explain_metadata.phpt b/ext/mysqli/tests/mysqli_explain_metadata.phpt index 8f4a7cc8c5..157559b340 100644 --- a/ext/mysqli/tests/mysqli_explain_metadata.phpt +++ b/ext/mysqli/tests/mysqli_explain_metadata.phpt @@ -159,5 +159,5 @@ if (!$IS_MYSQLND) <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt b/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt index 2fb8281939..171a1a4010 100644 --- a/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt @@ -31,7 +31,7 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- [002] array(2) { ["id"]=> diff --git a/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt b/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt index 82e4d7b666..ccd94043a1 100644 --- a/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt @@ -111,5 +111,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt index d9bdcfad37..586bfb03b3 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt @@ -113,5 +113,5 @@ mysqli_fetch_assoc() - BIT <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt index ce7e82dc08..09ff9d193d 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt @@ -74,5 +74,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt index e234a28fe5..f55a32b951 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt @@ -240,5 +240,5 @@ mysqli_close($link); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_fetch_field_types.phpt b/ext/mysqli/tests/mysqli_fetch_field_types.phpt index d02c02c765..70464ffb51 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_types.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_types.phpt @@ -122,5 +122,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_fork.phpt b/ext/mysqli/tests/mysqli_fork.phpt index f5a0b7bc95..4862b7a220 100644 --- a/ext/mysqli/tests/mysqli_fork.phpt +++ b/ext/mysqli/tests/mysqli_fork.phpt @@ -236,7 +236,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS messages")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(1) { ["message"]=> string(20) "dumped by the parent" diff --git a/ext/mysqli/tests/mysqli_get_client_info.phpt b/ext/mysqli/tests/mysqli_get_client_info.phpt index bb3f5cc1f1..ffb9e954cc 100644 --- a/ext/mysqli/tests/mysqli_get_client_info.phpt +++ b/ext/mysqli/tests/mysqli_get_client_info.phpt @@ -14,5 +14,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_client_stats_off.phpt b/ext/mysqli/tests/mysqli_get_client_stats_off.phpt index e2dff9befb..0b3d772d5c 100644 --- a/ext/mysqli/tests/mysqli_get_client_stats_off.phpt +++ b/ext/mysqli/tests/mysqli_get_client_stats_off.phpt @@ -44,5 +44,5 @@ mysqlnd.collect_memory_statistics=0 <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_client_version.phpt b/ext/mysqli/tests/mysqli_get_client_version.phpt index 5862c0aaa1..9fb1040580 100644 --- a/ext/mysqli/tests/mysqli_get_client_version.phpt +++ b/ext/mysqli/tests/mysqli_get_client_version.phpt @@ -10,5 +10,5 @@ mysqli_get_client_version() print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_connection_stats.phpt b/ext/mysqli/tests/mysqli_get_connection_stats.phpt index 64eba16679..80875a44e6 100644 --- a/ext/mysqli/tests/mysqli_get_connection_stats.phpt +++ b/ext/mysqli/tests/mysqli_get_connection_stats.phpt @@ -83,5 +83,5 @@ if (!function_exists('mysqli_get_connection_stats')) { <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt b/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt index 4897063c12..549d9c8a72 100644 --- a/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt +++ b/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt @@ -49,5 +49,5 @@ if (!function_exists('mysqli_get_connection_stats')) { mysqli_close($link); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_host_info.phpt b/ext/mysqli/tests/mysqli_get_host_info.phpt index 2c3c0f806d..0dd7291342 100644 --- a/ext/mysqli/tests/mysqli_get_host_info.phpt +++ b/ext/mysqli/tests/mysqli_get_host_info.phpt @@ -31,5 +31,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_proto_info.phpt b/ext/mysqli/tests/mysqli_get_proto_info.phpt index 7fbefeb853..28313670ad 100644 --- a/ext/mysqli/tests/mysqli_get_proto_info.phpt +++ b/ext/mysqli/tests/mysqli_get_proto_info.phpt @@ -25,5 +25,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_server_info.phpt b/ext/mysqli/tests/mysqli_get_server_info.phpt index a7f785302b..d1eb116cb0 100644 --- a/ext/mysqli/tests/mysqli_get_server_info.phpt +++ b/ext/mysqli/tests/mysqli_get_server_info.phpt @@ -29,5 +29,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_server_version.phpt b/ext/mysqli/tests/mysqli_get_server_version.phpt index b30c4a3801..30b95748b3 100644 --- a/ext/mysqli/tests/mysqli_get_server_version.phpt +++ b/ext/mysqli/tests/mysqli_get_server_version.phpt @@ -24,5 +24,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_warnings.phpt b/ext/mysqli/tests/mysqli_get_warnings.phpt index 2b70fda3ed..b0076c1859 100644 --- a/ext/mysqli/tests/mysqli_get_warnings.phpt +++ b/ext/mysqli/tests/mysqli_get_warnings.phpt @@ -154,5 +154,5 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS t1")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_info.phpt b/ext/mysqli/tests/mysqli_info.phpt index d60ffd9fbe..21851d6b30 100644 --- a/ext/mysqli/tests/mysqli_info.phpt +++ b/ext/mysqli/tests/mysqli_info.phpt @@ -94,5 +94,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_init.phpt b/ext/mysqli/tests/mysqli_init.phpt index 1abb7ca37e..c6774c311f 100644 --- a/ext/mysqli/tests/mysqli_init.phpt +++ b/ext/mysqli/tests/mysqli_init.phpt @@ -21,5 +21,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_insert_id_variation.phpt b/ext/mysqli/tests/mysqli_insert_id_variation.phpt index e858ca0689..12c858fbe4 100644 --- a/ext/mysqli/tests/mysqli_insert_id_variation.phpt +++ b/ext/mysqli/tests/mysqli_insert_id_variation.phpt @@ -99,5 +99,5 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_insert_id_var")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- DONE
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_insert_packet_overflow.phpt b/ext/mysqli/tests/mysqli_insert_packet_overflow.phpt index c7f38fa0fc..2833f3fb18 100644 --- a/ext/mysqli/tests/mysqli_insert_packet_overflow.phpt +++ b/ext/mysqli/tests/mysqli_insert_packet_overflow.phpt @@ -112,5 +112,5 @@ memory_limit=256M <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt index e42d3b31f3..85a36981b5 100644 --- a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt +++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt @@ -40,7 +40,7 @@ max_execution_time=12 print "done!"; ?> ---EXPECTF-- +--EXPECT-- array(1) { ["SLEEP(6)"]=> string(1) "0" diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt index 1d1b3c917f..a00ab15948 100644 --- a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt +++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt @@ -39,7 +39,7 @@ mysqlnd.net_read_timeout=0 print "done!"; ?> ---EXPECTF-- +--EXPECT-- array(1) { ["SLEEP(2)"]=> string(1) "0" diff --git a/ext/mysqli/tests/mysqli_no_reconnect.phpt b/ext/mysqli/tests/mysqli_no_reconnect.phpt index 653c672077..465f9fee97 100644 --- a/ext/mysqli/tests/mysqli_no_reconnect.phpt +++ b/ext/mysqli/tests/mysqli_no_reconnect.phpt @@ -123,5 +123,5 @@ mysqli.reconnect=0 mysqli_close($link2); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt b/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt index 4b0c947191..7b98713046 100644 --- a/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt +++ b/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt @@ -105,5 +105,5 @@ if (!$IS_MYSQLND) <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_options_openbasedir.phpt b/ext/mysqli/tests/mysqli_options_openbasedir.phpt index 9457adfb5d..d7b4b6b13e 100644 --- a/ext/mysqli/tests/mysqli_options_openbasedir.phpt +++ b/ext/mysqli/tests/mysqli_options_openbasedir.phpt @@ -25,5 +25,5 @@ if ($IS_MYSQLND) { mysqli_close($link); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_pam_sha256.phpt b/ext/mysqli/tests/mysqli_pam_sha256.phpt index 3016e200d7..760da471dd 100644 --- a/ext/mysqli/tests/mysqli_pam_sha256.phpt +++ b/ext/mysqli/tests/mysqli_pam_sha256.phpt @@ -109,5 +109,5 @@ $link->close(); $link->query('DROP USER shatest'); $link->query('DROP USER shatest@localhost'); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt index afed773b01..1461933015 100644 --- a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt +++ b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt @@ -128,5 +128,5 @@ $link->close(); $file = sprintf("%s%s%s_%s", sys_get_temp_dir(), DIRECTORY_SEPARATOR, "test_sha256_" , @date("Ymd")); @unlink($file); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt b/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt index 1453d663ba..9af480e003 100644 --- a/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt +++ b/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt @@ -140,7 +140,7 @@ mysqli.max_links=-1 print "done!"; ?> ---EXPECTF-- +--EXPECT-- array(1) { ["it_works"]=> string(2) "ok" diff --git a/ext/mysqli/tests/mysqli_pconn_kill.phpt b/ext/mysqli/tests/mysqli_pconn_kill.phpt index f8d8d7e8bd..b60bb3662b 100644 --- a/ext/mysqli/tests/mysqli_pconn_kill.phpt +++ b/ext/mysqli/tests/mysqli_pconn_kill.phpt @@ -91,5 +91,5 @@ mysqli.max_persistent=2 <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_pconn_limits.phpt b/ext/mysqli/tests/mysqli_pconn_limits.phpt index ee9e1f9cc6..960c4a2635 100644 --- a/ext/mysqli/tests/mysqli_pconn_limits.phpt +++ b/ext/mysqli/tests/mysqli_pconn_limits.phpt @@ -89,7 +89,7 @@ mysqli.max_links=-1 <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- Regular connection 1 - 'works..' Regular connection 2 - 'works...' Persistent connection 1 - 'works...' diff --git a/ext/mysqli/tests/mysqli_pconn_twice.phpt b/ext/mysqli/tests/mysqli_pconn_twice.phpt index c550f0f495..c821177eeb 100644 --- a/ext/mysqli/tests/mysqli_pconn_twice.phpt +++ b/ext/mysqli/tests/mysqli_pconn_twice.phpt @@ -65,7 +65,7 @@ mysqli.max_links=-1 print "done!"; ?> ---EXPECTF-- +--EXPECT-- array(1) { ["it_works"]=> string(2) "ok" diff --git a/ext/mysqli/tests/mysqli_pconnect.phpt b/ext/mysqli/tests/mysqli_pconnect.phpt index 734029acb1..ac17c22b84 100644 --- a/ext/mysqli/tests/mysqli_pconnect.phpt +++ b/ext/mysqli/tests/mysqli_pconnect.phpt @@ -68,5 +68,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_phpinfo.phpt b/ext/mysqli/tests/mysqli_phpinfo.phpt index e23a5f696f..2ecd838592 100644 --- a/ext/mysqli/tests/mysqli_phpinfo.phpt +++ b/ext/mysqli/tests/mysqli_phpinfo.phpt @@ -68,5 +68,5 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_prepare.phpt b/ext/mysqli/tests/mysqli_prepare.phpt index d6d6c092b9..0c3bedf5b5 100644 --- a/ext/mysqli/tests/mysqli_prepare.phpt +++ b/ext/mysqli/tests/mysqli_prepare.phpt @@ -130,6 +130,6 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test2")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- bool(false) done! diff --git a/ext/mysqli/tests/mysqli_prepare_no_object.phpt b/ext/mysqli/tests/mysqli_prepare_no_object.phpt index e45de69eda..b10706aa04 100644 --- a/ext/mysqli/tests/mysqli_prepare_no_object.phpt +++ b/ext/mysqli/tests/mysqli_prepare_no_object.phpt @@ -38,7 +38,7 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- a) [1065] Query was empty b) [1065] Query was empty c) [1065] Query was empty diff --git a/ext/mysqli/tests/mysqli_ps_select_union.phpt b/ext/mysqli/tests/mysqli_ps_select_union.phpt index 730dc8403b..cb5699fc1e 100644 --- a/ext/mysqli/tests/mysqli_ps_select_union.phpt +++ b/ext/mysqli/tests/mysqli_ps_select_union.phpt @@ -251,7 +251,7 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- Using CAST('somestring' AS CHAR)... string(3) "one" string(5) "three" diff --git a/ext/mysqli/tests/mysqli_query_stored_proc.phpt b/ext/mysqli/tests/mysqli_query_stored_proc.phpt index 4f4e671f3b..1df5cc8760 100644 --- a/ext/mysqli/tests/mysqli_query_stored_proc.phpt +++ b/ext/mysqli/tests/mysqli_query_stored_proc.phpt @@ -163,7 +163,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- array(2) { ["id"]=> string(1) "1" diff --git a/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt b/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt index 67c4442d28..20384d9a0f 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt @@ -74,7 +74,7 @@ mysqli_error($link)); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) done! diff --git a/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt b/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt index 208056fc47..14bf97c635 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt @@ -67,7 +67,7 @@ mysqli_error($link)); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) done! diff --git a/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt b/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt index 7fa5523661..cff45e06d4 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt @@ -66,7 +66,7 @@ mysqli_error($link)); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) done! diff --git a/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt b/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt index 0f7a5083b8..537ac7292f 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt @@ -67,7 +67,7 @@ mysqli_error($link)); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) done! diff --git a/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt b/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt index 945e1eaed7..85ac847666 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt @@ -67,7 +67,7 @@ mysqli_error($link)); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) done! diff --git a/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt b/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt index a121d5fb8f..47535f937e 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_nobackslash.phpt @@ -57,7 +57,7 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- array(1) { ["label"]=> string(1) "\" diff --git a/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt b/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt index ae4986e0b1..9e1562dba0 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt @@ -46,7 +46,7 @@ mysqli_close($link); mysqli_close($link); print "done!"; ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) done! diff --git a/ext/mysqli/tests/mysqli_reap_async_query.phpt b/ext/mysqli/tests/mysqli_reap_async_query.phpt index 3f3bce3292..b43b6b2478 100644 --- a/ext/mysqli/tests/mysqli_reap_async_query.phpt +++ b/ext/mysqli/tests/mysqli_reap_async_query.phpt @@ -87,7 +87,7 @@ if (!$IS_MYSQLND) print "done!"; ?> ---EXPECTF-- +--EXPECT-- [012 + 2] array ( '_one' => '1', ) diff --git a/ext/mysqli/tests/mysqli_reconnect.phpt b/ext/mysqli/tests/mysqli_reconnect.phpt index 7f05a20d2f..606d380285 100644 --- a/ext/mysqli/tests/mysqli_reconnect.phpt +++ b/ext/mysqli/tests/mysqli_reconnect.phpt @@ -126,5 +126,5 @@ mysqli.reconnect=1 mysqli_close($link2); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_ssl_set.phpt b/ext/mysqli/tests/mysqli_ssl_set.phpt index 2abae55c1e..8463cc58b8 100644 --- a/ext/mysqli/tests/mysqli_ssl_set.phpt +++ b/ext/mysqli/tests/mysqli_ssl_set.phpt @@ -57,5 +57,5 @@ if (!function_exists('mysqli_ssl_set')) */ print "done!\n"; ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_attr_get.phpt b/ext/mysqli/tests/mysqli_stmt_attr_get.phpt index d58885e986..92937a15ce 100644 --- a/ext/mysqli/tests/mysqli_stmt_attr_get.phpt +++ b/ext/mysqli/tests/mysqli_stmt_attr_get.phpt @@ -66,5 +66,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt b/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt index 0d5e8f9bec..e05843e5b7 100644 --- a/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt +++ b/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt @@ -25,5 +25,5 @@ die("SKIP: prefetch isn't supported at the moment"); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_attr_set.phpt b/ext/mysqli/tests/mysqli_stmt_attr_set.phpt index 5b53a06222..b3d60380cb 100644 --- a/ext/mysqli/tests/mysqli_stmt_attr_set.phpt +++ b/ext/mysqli/tests/mysqli_stmt_attr_set.phpt @@ -273,5 +273,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt b/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt index d7a78f1cf0..5ad6f583e7 100644 --- a/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt +++ b/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt @@ -46,5 +46,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt b/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt index 39c602034d..0daab8b11a 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_limits.phpt @@ -115,7 +115,7 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- Testing 273 columns with 240 rows... ... table created ... statement with 65520 parameters prepared diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt index 97b15242dc..a8a18ace85 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt @@ -328,7 +328,7 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- Regular, procedural, using variables int(1) string(1) "a" diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt index 29a5ee3fbd..5800a9bcc0 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_many_columns.phpt @@ -96,7 +96,7 @@ memory_limit=256M <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- int(1) executing bool(true) diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt index 58626be672..e7b581f815 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt @@ -203,5 +203,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt index daab40c506..2e3df083b7 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt @@ -123,5 +123,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt index acf0d0be2d..3818b6ccfd 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt @@ -155,5 +155,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt index 68ec601e10..64b0b192ff 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt @@ -337,5 +337,5 @@ memory_limit=83886080 <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt index 56508533ba..6d096531e8 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt @@ -93,5 +93,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt index 3380f0edbb..957044cd67 100644 --- a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt +++ b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt @@ -66,7 +66,7 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS type_change")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- bool(true) bool(true) ---- Row 1 diff --git a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt index 29e3947a78..f9ab267502 100644 --- a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt +++ b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt @@ -194,5 +194,5 @@ if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) mysqli_close($link); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt index 35433b136a..293761bb84 100644 --- a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt @@ -125,7 +125,7 @@ mysqli_close($link); ?> --XFAIL-- Unsupported and undefined, under development ---EXPECTF-- +--EXPECT-- [010] More results: yes [011] Next result: yes done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt b/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt index 2a2914ad88..49ca6f6bff 100644 --- a/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt +++ b/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt @@ -72,5 +72,5 @@ Fetching BIT column values using the PS API <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt b/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt index 0cbc05f6c7..14333e7665 100644 --- a/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt +++ b/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt @@ -50,7 +50,7 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- OK: 1 OK: 2 done! diff --git a/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt b/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt index 84998b9423..00bde68284 100644 --- a/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt +++ b/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt @@ -137,5 +137,5 @@ mysqli_stmt_fetch - geometry / spatial types <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt index 6c476f7e9d..87dd01223f 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt @@ -129,5 +129,5 @@ Fetching BIT column values using the PS API <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt index 046f90438e..a717bee50d 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt @@ -45,6 +45,6 @@ mysqli_stmt_get_result() - meta data, field_count() <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- 2 2 done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt index c86a385bee..9bfd7d6958 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt @@ -139,5 +139,5 @@ mysqli_stmt_get_result - geometry / spatial types <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt index c057f7d9fb..658f7da77f 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt @@ -91,5 +91,5 @@ if (!function_exists('mysqli_stmt_get_result')) <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt index 7b6d3c26a0..7d21558593 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt @@ -253,5 +253,5 @@ mysqli_stmt_get_result - data types <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_multires.phpt b/ext/mysqli/tests/mysqli_stmt_multires.phpt index 28cf5e38f4..b95bfd7f91 100644 --- a/ext/mysqli/tests/mysqli_stmt_multires.phpt +++ b/ext/mysqli/tests/mysqli_stmt_multires.phpt @@ -99,7 +99,7 @@ require_once('skipifconnectfailure.inc'); printf("[001] [%d] %s\n", $link->error, $link->errno); } ?> ---EXPECTF-- +--EXPECT-- string(4) "pre:" NULL NULL diff --git a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt index a7dad1b47c..44c1f1bdcc 100644 --- a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt +++ b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt @@ -228,5 +228,5 @@ die("skip Check again when the Klingons visit earth - http://bugs.mysql.com/bug. <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt index a1fc2007fe..eeb74d9093 100644 --- a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt +++ b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt @@ -94,5 +94,5 @@ if (stristr(mysqli_get_client_info(), 'mysqlnd')) <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt index 95d2302f4c..07acb041b5 100644 --- a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt +++ b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt @@ -99,5 +99,5 @@ Warning: mysqli_stmt_send_long_data(): There was an error while sending long dat <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_store_result.phpt b/ext/mysqli/tests/mysqli_stmt_store_result.phpt index aa292a9198..89b8ed3bf8 100644 --- a/ext/mysqli/tests/mysqli_stmt_store_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_store_result.phpt @@ -86,5 +86,5 @@ require_once('skipifconnectfailure.inc'); <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt b/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt index 2dec703b99..58d588ac49 100644 --- a/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt +++ b/ext/mysqli/tests/mysqli_store_result_buffered_c.phpt @@ -37,5 +37,5 @@ mysqlnd.debug=d:t:O,/tmp/mysqlnd.trace <?php require_once("clean_table.inc"); ?> ---EXPECTF-- +--EXPECT-- done! diff --git a/ext/mysqli/tests/mysqli_thread_safe.phpt b/ext/mysqli/tests/mysqli_thread_safe.phpt index 0777c2abd7..2f6a87ba42 100644 --- a/ext/mysqli/tests/mysqli_thread_safe.phpt +++ b/ext/mysqli/tests/mysqli_thread_safe.phpt @@ -12,5 +12,5 @@ require_once('skipifemb.inc'); print "done!"; ?> ---EXPECTF-- +--EXPECT-- done!
\ No newline at end of file |