diff options
Diffstat (limited to 'ext/mysqli/tests')
316 files changed, 3504 insertions, 870 deletions
diff --git a/ext/mysqli/tests/001.phpt b/ext/mysqli/tests/001.phpt index 77f3dcbd1..4e19d8109 100644 --- a/ext/mysqli/tests/001.phpt +++ b/ext/mysqli/tests/001.phpt @@ -1,8 +1,8 @@ --TEST-- mysqli connect --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> @@ -13,25 +13,25 @@ require_once('skipifconnectfailure.inc'); $test = ""; /*** test mysqli_connect localhost:port ***/ - $link = mysqli_connect($host, $user, $passwd, "", $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, "", $port, $socket); $test .= ($link) ? "1" : "0"; mysqli_close($link); /*** test mysqli_real_connect ***/ $link = mysqli_init(); - $test.= (mysqli_real_connect($link, $host, $user, $passwd, "", $port, $socket) ) + $test.= (my_mysqli_real_connect($link, $host, $user, $passwd, "", $port, $socket) ) ? "1" : "0"; mysqli_close($link); /*** test mysqli_real_connect with db ***/ $link = mysqli_init(); - $test .= (mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) + $test .= (my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) ? "1" : "0"; mysqli_close($link); /*** test mysqli_real_connect with port ***/ $link = mysqli_init(); - $test .= (mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) + $test .= (my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) ? "1":"0"; mysqli_close($link); @@ -40,7 +40,7 @@ require_once('skipifconnectfailure.inc'); if (!$link = mysqli_init()) printf("[001 + %d] mysqli_init() failed, [%d] %s\n", $i, mysqli_connect_errno(), mysqli_connect_error()); - if (!mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) + if (!my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) printf("[002 + %d] mysqli_real_connect() failed, [%d] %s\n", $i, mysqli_connect_errno(), mysqli_connect_error()); mysqli_close($link); @@ -49,7 +49,7 @@ require_once('skipifconnectfailure.inc'); /*** test mysqli_real_connect compressed ***/ /* $link = mysqli_init(); - $test .= (mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket, MYSQLI_CLIENT_COMPRESS)) + $test .= (my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket, MYSQLI_CLIENT_COMPRESS)) ? "1" : "0"; mysqli_close($link); */ diff --git a/ext/mysqli/tests/002.phpt b/ext/mysqli/tests/002.phpt index c41a070bf..6bbdecfdc 100644 --- a/ext/mysqli/tests/002.phpt +++ b/ext/mysqli/tests/002.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); if (!mysqli_query($link, "DROP TABLE IF EXISTS test_fetch_null")) @@ -46,6 +46,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_fetch_null")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(11) { [0]=> diff --git a/ext/mysqli/tests/003.phpt b/ext/mysqli/tests/003.phpt index 5a8d13c02..e22fec143 100644 --- a/ext/mysqli/tests/003.phpt +++ b/ext/mysqli/tests/003.phpt @@ -9,7 +9,7 @@ require_once('skipifconnectfailure.inc'); <?php include "connect.inc"; - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); mysqli_query($link, "SET sql_mode=''"); @@ -72,6 +72,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(7) { [0]=> diff --git a/ext/mysqli/tests/004.phpt b/ext/mysqli/tests/004.phpt index d4d318fc3..1eae99df7 100644 --- a/ext/mysqli/tests/004.phpt +++ b/ext/mysqli/tests/004.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include ("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); mysqli_select_db($link, $db); @@ -47,6 +47,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(2) { [0]=> diff --git a/ext/mysqli/tests/005.phpt b/ext/mysqli/tests/005.phpt index 0ceabafaa..728f45e06 100644 --- a/ext/mysqli/tests/005.phpt +++ b/ext/mysqli/tests/005.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); @@ -32,11 +32,25 @@ require_once('skipifconnectfailure.inc'); var_dump($test); + /* this will crash with libmysql from PHP 5.0.6 (or earlier) to 5.3.0 */ + mysqli_fetch($stmt); + mysqli_stmt_close($stmt); mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(2) { [0]=> diff --git a/ext/mysqli/tests/006.phpt b/ext/mysqli/tests/006.phpt index b11760c6d..a10e22c44 100644 --- a/ext/mysqli/tests/006.phpt +++ b/ext/mysqli/tests/006.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); if (!mysqli_query($link, "SET sql_mode=''")) printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); @@ -45,6 +45,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- array(7) { [0]=> diff --git a/ext/mysqli/tests/007.phpt b/ext/mysqli/tests/007.phpt index f0a144686..fe266bf1b 100644 --- a/ext/mysqli/tests/007.phpt +++ b/ext/mysqli/tests/007.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); if (!mysqli_query($link, "SET sql_mode=''")) printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); @@ -45,6 +45,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- array(7) { [0]=> diff --git a/ext/mysqli/tests/008.phpt b/ext/mysqli/tests/008.phpt index 00ac730ba..685110f08 100644 --- a/ext/mysqli/tests/008.phpt +++ b/ext/mysqli/tests/008.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); if (!mysqli_query($link, "SET sql_mode=''")) printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); @@ -45,6 +45,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- array(7) { [0]=> diff --git a/ext/mysqli/tests/009.phpt b/ext/mysqli/tests/009.phpt index 4ed87950e..0584a14cf 100644 --- a/ext/mysqli/tests/009.phpt +++ b/ext/mysqli/tests/009.phpt @@ -14,7 +14,7 @@ mysqli fetch bigint values (ok to fail with 4.1.x) include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); if (!mysqli_query($link, "SET sql_mode=''")) printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); @@ -78,7 +78,20 @@ mysqli fetch bigint values (ok to fail with 4.1.x) mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch_uint")) + printf("[002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(8) { [0]=> diff --git a/ext/mysqli/tests/010.phpt b/ext/mysqli/tests/010.phpt index 13752b1ab..de22c0824 100644 --- a/ext/mysqli/tests/010.phpt +++ b/ext/mysqli/tests/010.phpt @@ -12,7 +12,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); if (!mysqli_query($link, "SET sql_mode=''")) printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); @@ -48,6 +48,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- array(7) { [0]=> diff --git a/ext/mysqli/tests/011.phpt b/ext/mysqli/tests/011.phpt index ace0a88b9..4c4ff7706 100644 --- a/ext/mysqli/tests/011.phpt +++ b/ext/mysqli/tests/011.phpt @@ -12,7 +12,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result")) printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); @@ -45,6 +45,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(8) { [0]=> diff --git a/ext/mysqli/tests/012.phpt b/ext/mysqli/tests/012.phpt index 5f2e4d1dd..2ce810400 100644 --- a/ext/mysqli/tests/012.phpt +++ b/ext/mysqli/tests/012.phpt @@ -12,7 +12,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result")) printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); @@ -44,6 +44,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(8) { [0]=> diff --git a/ext/mysqli/tests/013.phpt b/ext/mysqli/tests/013.phpt index fc8211b2b..8c123d1ab 100644 --- a/ext/mysqli/tests/013.phpt +++ b/ext/mysqli/tests/013.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result")) printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); @@ -56,6 +56,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- ok done!
\ No newline at end of file diff --git a/ext/mysqli/tests/014.phpt b/ext/mysqli/tests/014.phpt index eb2b7322e..cd7fa19c7 100644 --- a/ext/mysqli/tests/014.phpt +++ b/ext/mysqli/tests/014.phpt @@ -5,7 +5,7 @@ mysqli autocommit/commit/rollback require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); include "connect.inc"; - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_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"); } @@ -22,7 +22,7 @@ mysqli autocommit/commit/rollback --FILE-- <?php include "connect.inc"; - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); if (!mysqli_autocommit($link, TRUE)) printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); @@ -82,6 +82,10 @@ mysqli autocommit/commit/rollback mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Num_of_rows=1 array(2) { diff --git a/ext/mysqli/tests/015.phpt b/ext/mysqli/tests/015.phpt index 8eaddfc84..b3af0142a 100644 --- a/ext/mysqli/tests/015.phpt +++ b/ext/mysqli/tests/015.phpt @@ -5,7 +5,7 @@ mysqli autocommit/commit/rollback with innodb require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); include "connect.inc"; - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_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); @@ -19,7 +19,7 @@ mysqli autocommit/commit/rollback with innodb <?php include "connect.inc"; - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); if (!$link) printf("[001] Cannot connect, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); @@ -77,6 +77,10 @@ mysqli autocommit/commit/rollback with innodb mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- array(2) { [0]=> diff --git a/ext/mysqli/tests/016.phpt b/ext/mysqli/tests/016.phpt index 286df398d..c8046de9a 100644 --- a/ext/mysqli/tests/016.phpt +++ b/ext/mysqli/tests/016.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); if (!mysqli_query($link, "SET @dummy='foobar'")) printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); diff --git a/ext/mysqli/tests/017.phpt b/ext/mysqli/tests/017.phpt index d201c7b80..7220b4ef0 100644 --- a/ext/mysqli/tests/017.phpt +++ b/ext/mysqli/tests/017.phpt @@ -11,7 +11,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); if (!$stmt = mysqli_prepare($link, "SELECT md5('bar'), database(), 'foo'")) printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); diff --git a/ext/mysqli/tests/018.phpt b/ext/mysqli/tests/018.phpt index c5c60c7ae..1a8d76208 100644 --- a/ext/mysqli/tests/018.phpt +++ b/ext/mysqli/tests/018.phpt @@ -1,8 +1,8 @@ --TEST-- mysqli fetch system variables --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); if (!mysqli_query($link, "SET AUTOCOMMIT=0")) printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); diff --git a/ext/mysqli/tests/019.phpt b/ext/mysqli/tests/019.phpt index 30a55aa3c..f3741a5d3 100644 --- a/ext/mysqli/tests/019.phpt +++ b/ext/mysqli/tests/019.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); if (!mysqli_query($link, "DROP TABLE IF EXISTS insert_read")) printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); @@ -55,6 +55,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS insert_read")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(11) { [0]=> diff --git a/ext/mysqli/tests/020.phpt b/ext/mysqli/tests/020.phpt index 9035cceb9..f313a616a 100644 --- a/ext/mysqli/tests/020.phpt +++ b/ext/mysqli/tests/020.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); mysqli_select_db($link, $db); mysqli_query($link, "SET sql_mode=''"); @@ -67,6 +67,17 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(7) { [0]=> diff --git a/ext/mysqli/tests/021.phpt b/ext/mysqli/tests/021.phpt index 28e2800a0..3843566ea 100644 --- a/ext/mysqli/tests/021.phpt +++ b/ext/mysqli/tests/021.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); mysqli_select_db($link, $db); @@ -38,6 +38,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(2) { [0]=> diff --git a/ext/mysqli/tests/022.phpt b/ext/mysqli/tests/022.phpt index 36fdd7cee..5c448b9c1 100644 --- a/ext/mysqli/tests/022.phpt +++ b/ext/mysqli/tests/022.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); mysqli_select_db($link, $db); @@ -43,6 +43,17 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(2) { [0]=> diff --git a/ext/mysqli/tests/023.phpt b/ext/mysqli/tests/023.phpt index 4613a2c47..d3d4762a6 100644 --- a/ext/mysqli/tests/023.phpt +++ b/ext/mysqli/tests/023.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); mysqli_select_db($link, $db); mysqli_query($link, "SET sql_mode=''"); @@ -52,6 +52,17 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- array(7) { [0]=> diff --git a/ext/mysqli/tests/024.phpt b/ext/mysqli/tests/024.phpt index e5bcdaf47..7dd540853 100644 --- a/ext/mysqli/tests/024.phpt +++ b/ext/mysqli/tests/024.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); mysqli_select_db($link, $db); mysqli_query($link, "SET sql_mode=''"); @@ -52,6 +52,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- array(7) { [0]=> diff --git a/ext/mysqli/tests/025.phpt b/ext/mysqli/tests/025.phpt index 8f419ae35..9c076dfae 100644 --- a/ext/mysqli/tests/025.phpt +++ b/ext/mysqli/tests/025.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); mysqli_select_db($link, $db); mysqli_query($link, "SET sql_mode=''"); @@ -57,6 +57,17 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- array(7) { [0]=> diff --git a/ext/mysqli/tests/026.phpt b/ext/mysqli/tests/026.phpt index 597a16d12..57fe33e00 100644 --- a/ext/mysqli/tests/026.phpt +++ b/ext/mysqli/tests/026.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); mysqli_select_db($link, $db); mysqli_query($link, "SET sql_mode=''"); @@ -43,6 +43,18 @@ require_once('skipifconnectfailure.inc'); mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"); mysqli_close($link); print "done!"; +?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(2) { [0]=> diff --git a/ext/mysqli/tests/027.phpt b/ext/mysqli/tests/027.phpt index c52c73e61..0926b70e2 100644 --- a/ext/mysqli/tests/027.phpt +++ b/ext/mysqli/tests/027.phpt @@ -1,8 +1,8 @@ --TEST-- function test: mysqli_stat --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); $status = mysqli_stat($link); diff --git a/ext/mysqli/tests/028.phpt b/ext/mysqli/tests/028.phpt index a518b7dad..6c4425e2b 100644 --- a/ext/mysqli/tests/028.phpt +++ b/ext/mysqli/tests/028.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); $cset = substr(mysqli_character_set_name($link),0,6); diff --git a/ext/mysqli/tests/029.phpt b/ext/mysqli/tests/029.phpt index b282e7c2e..bfc54bcc6 100644 --- a/ext/mysqli/tests/029.phpt +++ b/ext/mysqli/tests/029.phpt @@ -10,11 +10,11 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); mysqli_select_db($link, $db); - mysqli_query($link, "DROP TABLE IF EXISTS exists general_test"); + mysqli_query($link, "DROP TABLE IF EXISTS general_test"); mysqli_query($link, "CREATE TABLE general_test (a INT)"); mysqli_query($link, "INSERT INTO general_test VALUES (1),(2),(3)"); @@ -22,10 +22,21 @@ require_once('skipifconnectfailure.inc'); var_dump($afc); - mysqli_query($link, "DROP TABLE IF EXISTS exists general_test"); + mysqli_query($link, "DROP TABLE IF EXISTS general_test"); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS general_test")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- int(3) done!
\ No newline at end of file diff --git a/ext/mysqli/tests/030.phpt b/ext/mysqli/tests/030.phpt index af0210c87..656946fb6 100644 --- a/ext/mysqli/tests/030.phpt +++ b/ext/mysqli/tests/030.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); $errno = mysqli_errno($link); var_dump($errno); diff --git a/ext/mysqli/tests/031.phpt b/ext/mysqli/tests/031.phpt index cf70e9bca..9f632cb42 100644 --- a/ext/mysqli/tests/031.phpt +++ b/ext/mysqli/tests/031.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); $error = mysqli_error($link); var_dump($error); diff --git a/ext/mysqli/tests/032.phpt b/ext/mysqli/tests/032.phpt index e6e03477f..386883d0e 100644 --- a/ext/mysqli/tests/032.phpt +++ b/ext/mysqli/tests/032.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); mysqli_select_db($link, $db); @@ -26,6 +26,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS general_test")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- %unicode|string%(38) "Records: 3 Duplicates: 0 Warnings: 0" done!
\ No newline at end of file diff --git a/ext/mysqli/tests/033.phpt b/ext/mysqli/tests/033.phpt index 081be99a2..ade0bb832 100644 --- a/ext/mysqli/tests/033.phpt +++ b/ext/mysqli/tests/033.phpt @@ -11,7 +11,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); $hinfo = mysqli_get_host_info($link); diff --git a/ext/mysqli/tests/034.phpt b/ext/mysqli/tests/034.phpt index c195d7bff..cc415344c 100644 --- a/ext/mysqli/tests/034.phpt +++ b/ext/mysqli/tests/034.phpt @@ -1,8 +1,8 @@ --TEST-- function test: mysqli_get_proto_info --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> @@ -11,7 +11,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); $pinfo = mysqli_get_proto_info($link); diff --git a/ext/mysqli/tests/035.phpt b/ext/mysqli/tests/035.phpt index 58f0246df..7b621aa22 100644 --- a/ext/mysqli/tests/035.phpt +++ b/ext/mysqli/tests/035.phpt @@ -1,8 +1,8 @@ --TEST-- function test: mysqli_get_server_info --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); $sinfo = substr(mysqli_get_server_info($link),0,1); diff --git a/ext/mysqli/tests/036.phpt b/ext/mysqli/tests/036.phpt index 45b5fda5a..4e68b6c2a 100644 --- a/ext/mysqli/tests/036.phpt +++ b/ext/mysqli/tests/036.phpt @@ -14,7 +14,7 @@ function test: mysqli_insert_id() include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); mysqli_select_db($link, $db); @@ -42,6 +42,17 @@ function test: mysqli_insert_id() mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS t036")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- array(2) { [0]=> diff --git a/ext/mysqli/tests/037.phpt b/ext/mysqli/tests/037.phpt index cb721e08a..856bdc698 100644 --- a/ext/mysqli/tests/037.phpt +++ b/ext/mysqli/tests/037.phpt @@ -11,7 +11,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); mysqli_select_db($link, $db); @@ -32,6 +32,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_result")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- array(2) { [0]=> diff --git a/ext/mysqli/tests/038.phpt b/ext/mysqli/tests/038.phpt index bc3c54419..7be16f449 100644 --- a/ext/mysqli/tests/038.phpt +++ b/ext/mysqli/tests/038.phpt @@ -11,7 +11,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); mysqli_select_db($link, $db); @@ -33,5 +33,16 @@ require_once('skipifconnectfailure.inc'); mysqli_query($link, "DROP TABLE IF EXISTS test_result"); mysqli_close($link); ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_result")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- int(2) diff --git a/ext/mysqli/tests/039.phpt b/ext/mysqli/tests/039.phpt index 173c19222..9ed7ef9ea 100644 --- a/ext/mysqli/tests/039.phpt +++ b/ext/mysqli/tests/039.phpt @@ -11,7 +11,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); mysqli_real_query($link, "SHOW VARIABLES"); diff --git a/ext/mysqli/tests/040.phpt b/ext/mysqli/tests/040.phpt index 675d34518..6b115166b 100644 --- a/ext/mysqli/tests/040.phpt +++ b/ext/mysqli/tests/040.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); mysqli_select_db($link, $db); @@ -31,6 +31,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_result")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- int(1) done!
\ No newline at end of file diff --git a/ext/mysqli/tests/041.phpt b/ext/mysqli/tests/041.phpt index 81bd808c4..aac91f86a 100644 --- a/ext/mysqli/tests/041.phpt +++ b/ext/mysqli/tests/041.phpt @@ -1,8 +1,8 @@ --TEST-- function test: mysqli_warning_count() --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -11,7 +11,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); mysqli_select_db($link, $db); mysqli_query($link, "DROP TABLE IF EXISTS test_warnings"); @@ -22,6 +22,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_warnings")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- int(1) done!
\ No newline at end of file diff --git a/ext/mysqli/tests/042.phpt b/ext/mysqli/tests/042.phpt index 401006b39..9d79f148c 100644 --- a/ext/mysqli/tests/042.phpt +++ b/ext/mysqli/tests/042.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); mysqli_select_db($link, $db); mysqli_query($link, "SET sql_mode=''"); @@ -48,6 +48,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!" ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- object(stdClass)#%d (7) { [%u|b%"c1"]=> diff --git a/ext/mysqli/tests/043.phpt b/ext/mysqli/tests/043.phpt index 0cf3e3749..51b2a91ff 100644 --- a/ext/mysqli/tests/043.phpt +++ b/ext/mysqli/tests/043.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); mysqli_select_db($link, $db); @@ -40,6 +40,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_update")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(1) { [0]=> diff --git a/ext/mysqli/tests/044.phpt b/ext/mysqli/tests/044.phpt index 0a2495b9c..9d227f49e 100644 --- a/ext/mysqli/tests/044.phpt +++ b/ext/mysqli/tests/044.phpt @@ -1,8 +1,8 @@ --TEST-- mysqli_get_server_version --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); $i = mysqli_get_server_version($link); diff --git a/ext/mysqli/tests/045.phpt b/ext/mysqli/tests/045.phpt index a1ef9ec40..d5ee5ad2b 100644 --- a/ext/mysqli/tests/045.phpt +++ b/ext/mysqli/tests/045.phpt @@ -7,7 +7,7 @@ mysqli_bind_result (SHOW) require_once('skipifconnectfailure.inc'); include "connect.inc"; - $link = mysqli_connect($host, $user, $passwd); + $link = my_mysqli_connect($host, $user, $passwd); $stmt = mysqli_prepare($link, "SHOW VARIABLES LIKE 'port'"); mysqli_execute($stmt); @@ -23,7 +23,7 @@ mysqli_bind_result (SHOW) include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); $stmt = mysqli_prepare($link, "SHOW VARIABLES LIKE 'port'"); mysqli_execute($stmt); @@ -31,7 +31,7 @@ mysqli_bind_result (SHOW) mysqli_bind_result($stmt, $c1, $c2); mysqli_fetch($stmt); mysqli_stmt_close($stmt); - if (ini_get("unicode.semantics") && mysqli_get_server_version($link) < 50000) { + if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && mysqli_get_server_version($link) < 50000) { /* variables are binary */ settype($c1, "unicode"); settype($c2, "unicode"); diff --git a/ext/mysqli/tests/046.phpt b/ext/mysqli/tests/046.phpt index a08a9349e..cf7739210 100644 --- a/ext/mysqli/tests/046.phpt +++ b/ext/mysqli/tests/046.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); mysqli_select_db($link, $db); @@ -34,6 +34,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_affected")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- bool(true) done!
\ No newline at end of file diff --git a/ext/mysqli/tests/047.phpt b/ext/mysqli/tests/047.phpt index 172f2ef1d..3401418e9 100644 --- a/ext/mysqli/tests/047.phpt +++ b/ext/mysqli/tests/047.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); mysqli_select_db($link, $db); @@ -45,6 +45,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_affected")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- === fetch_fields === array(2) { diff --git a/ext/mysqli/tests/048.phpt b/ext/mysqli/tests/048.phpt index a63b0a3a9..5ab60e5a5 100644 --- a/ext/mysqli/tests/048.phpt +++ b/ext/mysqli/tests/048.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $mysql = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $mysql = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); $mysql->select_db($db); $mysql->query("DROP TABLE IF EXISTS test_fetch_null"); @@ -40,6 +40,17 @@ require_once('skipifconnectfailure.inc'); $mysql->close(); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_fetch_null")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(11) { [0]=> diff --git a/ext/mysqli/tests/049.phpt b/ext/mysqli/tests/049.phpt index afd237654..eb977a8b6 100644 --- a/ext/mysqli/tests/049.phpt +++ b/ext/mysqli/tests/049.phpt @@ -11,7 +11,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $mysql = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $mysql = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); $mysql->select_db($db); $result = $mysql->query("SELECT DATABASE()"); @@ -19,6 +19,8 @@ require_once('skipifconnectfailure.inc'); $result->close(); var_dump($row); + if ($row[0] != $db) + printf("[001] Expecting '%s' got '%s'\n", $db, $row[0]); $mysql->close(); print "done!"; diff --git a/ext/mysqli/tests/050.phpt b/ext/mysqli/tests/050.phpt index ee1c20322..ba668f0a8 100644 --- a/ext/mysqli/tests/050.phpt +++ b/ext/mysqli/tests/050.phpt @@ -1,8 +1,8 @@ --TEST-- non freed statement test --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -12,7 +12,7 @@ require_once('skipifconnectfailure.inc'); /************************ * non freed stamement ************************/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); $stmt = mysqli_prepare($link, "SELECT CURRENT_USER()"); mysqli_execute($stmt); diff --git a/ext/mysqli/tests/051.phpt b/ext/mysqli/tests/051.phpt index 8ff75d59b..82665156d 100644 --- a/ext/mysqli/tests/051.phpt +++ b/ext/mysqli/tests/051.phpt @@ -1,8 +1,8 @@ --TEST-- free statement after close --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -12,7 +12,7 @@ require_once('skipifconnectfailure.inc'); /************************ * free statement after close ************************/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); $stmt1 = mysqli_prepare($link, "SELECT CURRENT_USER()"); mysqli_execute($stmt1); diff --git a/ext/mysqli/tests/052.phpt b/ext/mysqli/tests/052.phpt index 95fdc2f27..f280d8406 100644 --- a/ext/mysqli/tests/052.phpt +++ b/ext/mysqli/tests/052.phpt @@ -1,18 +1,18 @@ --TEST-- call statement after close --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php include "connect.inc"; - + /************************ - * statement call after close + * statement call after close ************************/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); $stmt2 = mysqli_prepare($link, "SELECT CURRENT_USER()"); diff --git a/ext/mysqli/tests/053.phpt b/ext/mysqli/tests/053.phpt index 5a60b0fc0..e0bbcbeee 100644 --- a/ext/mysqli/tests/053.phpt +++ b/ext/mysqli/tests/053.phpt @@ -1,18 +1,18 @@ --TEST-- -not freed resultset +not freed resultset --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php include "connect.inc"; - + /************************ - * non freed resultset + * non freed resultset ************************/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); $result = mysqli_query($link, "SELECT CURRENT_USER()"); mysqli_close($link); diff --git a/ext/mysqli/tests/054.phpt b/ext/mysqli/tests/054.phpt index 969ae7a1f..2d957cb3c 100644 --- a/ext/mysqli/tests/054.phpt +++ b/ext/mysqli/tests/054.phpt @@ -1,18 +1,18 @@ --TEST-- -free resultset after close +free resultset after close --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php include "connect.inc"; - + /************************ - * free resultset after close + * free resultset after close ************************/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); $result1 = mysqli_query($link, "SELECT CURRENT_USER()"); mysqli_close($link); diff --git a/ext/mysqli/tests/055.phpt b/ext/mysqli/tests/055.phpt index 1d0f6c9df..1f0461bb2 100644 --- a/ext/mysqli/tests/055.phpt +++ b/ext/mysqli/tests/055.phpt @@ -1,18 +1,18 @@ --TEST-- -free nothing +free nothing --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php include "connect.inc"; - + /************************ - * don't free anything + * don't free anything ************************/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); $result2 = mysqli_query($link, "SELECT CURRENT_USER()"); $stmt2 = mysqli_prepare($link, "SELECT CURRENT_USER()"); diff --git a/ext/mysqli/tests/057.phpt b/ext/mysqli/tests/057.phpt index d4203b44f..9da9a1014 100644 --- a/ext/mysqli/tests/057.phpt +++ b/ext/mysqli/tests/057.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); mysqli_select_db($link, $db); @@ -62,6 +62,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); echo "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_store_result")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- bool(true) bool(true) diff --git a/ext/mysqli/tests/058.phpt b/ext/mysqli/tests/058.phpt index ae8b69b79..d1a90a004 100644 --- a/ext/mysqli/tests/058.phpt +++ b/ext/mysqli/tests/058.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); mysqli_select_db($link, $db); @@ -48,6 +48,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS mbind")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(4) { [0]=> diff --git a/ext/mysqli/tests/059.phpt b/ext/mysqli/tests/059.phpt index 8eadbd9e8..4897981cf 100644 --- a/ext/mysqli/tests/059.phpt +++ b/ext/mysqli/tests/059.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); mysqli_select_db($link, $db); @@ -41,6 +41,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS mbind")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- %unicode|string%(6) "foobar" done!
\ No newline at end of file diff --git a/ext/mysqli/tests/060.phpt b/ext/mysqli/tests/060.phpt index 0162873c8..f1c20bfa1 100644 --- a/ext/mysqli/tests/060.phpt +++ b/ext/mysqli/tests/060.phpt @@ -16,7 +16,7 @@ require_once('skipifconnectfailure.inc'); } /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); mysqli_select_db($link, $db); mysqli_query($link, "SET sql_mode=''"); @@ -42,6 +42,17 @@ require_once('skipifconnectfailure.inc'); echo "Done\n"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- test_class::__construct(1,2) object(test_class)#%d (7) { diff --git a/ext/mysqli/tests/061.phpt b/ext/mysqli/tests/061.phpt index 03b3d84f3..e40f3a273 100644 --- a/ext/mysqli/tests/061.phpt +++ b/ext/mysqli/tests/061.phpt @@ -17,7 +17,7 @@ if (!function_exists('mysqli_set_local_infile_handler')) } /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); /* create temporary file */ $filename = dirname(__FILE__) . "061.csv"; @@ -49,9 +49,20 @@ if (!function_exists('mysqli_set_local_infile_handler')) unlink($filename); print "done!"; ?> ---EXPECT-- +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS t_061")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> +--EXPECTF-- foo-bar %unicode|string%-%unicode|string% rab-oof %unicode|string%-%unicode|string% -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/062.phpt b/ext/mysqli/tests/062.phpt index 738b2ec8c..043855365 100644 --- a/ext/mysqli/tests/062.phpt +++ b/ext/mysqli/tests/062.phpt @@ -9,7 +9,7 @@ require_once('skipifconnectfailure.inc'); <?php include "connect.inc"; - $mysql = new mysqli($host, $user, $passwd, $db, $port, $socket); + $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); $mysql->real_query("SELECT 'foo' FROM DUAL"); diff --git a/ext/mysqli/tests/063.phpt b/ext/mysqli/tests/063.phpt index fbbdacd59..9b42ab7fb 100644 --- a/ext/mysqli/tests/063.phpt +++ b/ext/mysqli/tests/063.phpt @@ -9,7 +9,7 @@ require_once('skipifconnectfailure.inc'); <?php include "connect.inc"; - $mysql = new mysqli($host, $user, $passwd, $db, $port, $socket); + $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); $stmt = new mysqli_stmt($mysql, "SELECT 'foo' FROM DUAL"); $stmt->execute(); diff --git a/ext/mysqli/tests/064.phpt b/ext/mysqli/tests/064.phpt index 729fb6b45..a308e4ab2 100644 --- a/ext/mysqli/tests/064.phpt +++ b/ext/mysqli/tests/064.phpt @@ -1,15 +1,15 @@ --TEST-- -NULL binding +NULL binding --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php include "connect.inc"; - $mysql = new mysqli($host, $user, $passwd, $db, $port, $socket); + $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); $stmt = new mysqli_stmt($mysql, "SELECT NULL FROM DUAL"); $stmt->execute(); diff --git a/ext/mysqli/tests/065.phpt b/ext/mysqli/tests/065.phpt index 9819f2613..d0f1d1629 100644 --- a/ext/mysqli/tests/065.phpt +++ b/ext/mysqli/tests/065.phpt @@ -16,7 +16,7 @@ if (version_compare(PHP_VERSION, '5.9.9', '>') == 1) { <?php include "connect.inc"; - if (!$mysql = new mysqli($host, $user, $passwd, $db, $port, $socket)) + if (!$mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); if (!mysqli_query($mysql, "SET sql_mode=''")) diff --git a/ext/mysqli/tests/066.phpt b/ext/mysqli/tests/066.phpt index bdf253b7b..7581876ca 100644 --- a/ext/mysqli/tests/066.phpt +++ b/ext/mysqli/tests/066.phpt @@ -1,8 +1,8 @@ --TEST-- function test: mysqli_warning object --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -11,7 +11,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; /*** test mysqli_connect 127.0.0.1 ***/ - $mysql = new mysqli($host, $user, $passwd, $db, $port, $socket); + $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); $mysql->query("DROP TABLE IF EXISTS test_warnings"); @@ -28,6 +28,17 @@ require_once('skipifconnectfailure.inc'); $mysql->close(); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_warnings")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- Warning done! diff --git a/ext/mysqli/tests/067.phpt b/ext/mysqli/tests/067.phpt index da372607c..f57149518 100644 --- a/ext/mysqli/tests/067.phpt +++ b/ext/mysqli/tests/067.phpt @@ -6,7 +6,7 @@ function test: nested selects (cursors) require_once('skipifconnectfailure.inc'); include "connect.inc"; - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to check required version"); /* skip cursor test for versions < 50004 */ @@ -30,7 +30,7 @@ function test: nested selects (cursors) } include "connect.inc"; - $mysql = new mysqli($host, $user, $passwd, $db, $port, $socket); + $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); if ((!$IS_MYSQLND && mysqli_get_client_version() < 50009) || (mysqli_get_server_version($mysql) < 50009)) { @@ -64,5 +64,18 @@ function test: nested selects (cursors) $mysql->close(); var_dump($cnt); ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +for ($i =0; $i < 3; $i++) { + if (!mysqli_query($link, sprintf("DROP TABLE IF EXISTS cursor%d", $i))) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); +} + +mysqli_close($link); +?> --EXPECT-- int(63)
\ No newline at end of file diff --git a/ext/mysqli/tests/069.phpt b/ext/mysqli/tests/069.phpt index c6b498e8a..404b6ab10 100644 --- a/ext/mysqli/tests/069.phpt +++ b/ext/mysqli/tests/069.phpt @@ -9,7 +9,7 @@ require_once('skipifconnectfailure.inc'); <?php include "connect.inc"; - $mysql = new mysqli($host, $user, $passwd, $db, $port, $socket); + $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); $mysql->multi_query('SELECT 1;SELECT 2'); do { $res = $mysql->store_result(); diff --git a/ext/mysqli/tests/070.phpt b/ext/mysqli/tests/070.phpt index 3064ac11e..eee512513 100644 --- a/ext/mysqli/tests/070.phpt +++ b/ext/mysqli/tests/070.phpt @@ -1,15 +1,15 @@ --TEST-- mysqli ping --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php include "connect.inc"; - $mysql = new mysqli($host, $user, $passwd, $db, $port, $socket); + $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); var_dump($mysql->ping()); $mysql->close(); print "done!"; diff --git a/ext/mysqli/tests/071.phpt b/ext/mysqli/tests/071.phpt index e2fcaf18a..8888fb170 100644 --- a/ext/mysqli/tests/071.phpt +++ b/ext/mysqli/tests/071.phpt @@ -1,8 +1,8 @@ --TEST-- mysqli thread_id & kill --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); <?php include "connect.inc"; - $mysql = new mysqli($host, $user, $passwd, $db, $port, $socket); + $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); var_dump($mysql->ping()); @@ -20,7 +20,7 @@ require_once('skipifconnectfailure.inc'); $mysql->close(); - $mysql = new mysqli($host, $user, $passwd, $db, $port, $socket); + $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); var_dump(mysqli_ping($mysql)); diff --git a/ext/mysqli/tests/072.phpt b/ext/mysqli/tests/072.phpt index db05d5d22..637014b29 100644 --- a/ext/mysqli/tests/072.phpt +++ b/ext/mysqli/tests/072.phpt @@ -9,7 +9,7 @@ require_once('skipifconnectfailure.inc'); <?php include "connect.inc"; - $mysql = new mysqli($host, $user, $passwd, $db, $port, $socket); + $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); $mysql->query("DROP TABLE IF EXISTS not_exists"); diff --git a/ext/mysqli/tests/074.phpt b/ext/mysqli/tests/074.phpt index 0d935d35d..883655bc5 100644 --- a/ext/mysqli/tests/074.phpt +++ b/ext/mysqli/tests/074.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include "connect.inc"; - $mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket); + $mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket); var_dump($mysqli->autocommit(false)); $result = $mysqli->query("SELECT @@autocommit"); diff --git a/ext/mysqli/tests/bug31668.phpt b/ext/mysqli/tests/bug31668.phpt index b9a958955..cdca551f2 100644 --- a/ext/mysqli/tests/bug31668.phpt +++ b/ext/mysqli/tests/bug31668.phpt @@ -11,7 +11,7 @@ error_reporting = E_ALL & ~E_STRICT <?php include "connect.inc"; - $mysql = new mysqli($host, $user, $passwd, $db, $port, $socket); + $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); $mysql->multi_query('SELECT 1;SELECT 2'); do { $res = $mysql->store_result(); @@ -25,7 +25,7 @@ error_reporting = E_ALL & ~E_STRICT var_dump($mysql->error, __LINE__); $mysql->close(); - $mysql = new mysqli($host, $user, $passwd, $db, $port, $socket); + $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); $mysql->multi_query('SELECT 1;SELECT 2'); do { $res = $mysql->store_result(); diff --git a/ext/mysqli/tests/bug32405.phpt b/ext/mysqli/tests/bug32405.phpt index 7754f60a9..24bcdb4d0 100644 --- a/ext/mysqli/tests/bug32405.phpt +++ b/ext/mysqli/tests/bug32405.phpt @@ -1,8 +1,8 @@ --TEST-- Bug #32405 (mysqli->fetch() is returning bad data) --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -10,10 +10,10 @@ require_once('skipifconnectfailure.inc'); include ("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); mysqli_select_db($link, "test"); mysqli_query($link, "SET sql_mode=''"); - + /* two fields are needed. the problem does not occur with 1 field only selected. */ $link->query("CREATE TABLE test_users(user_id int(10) unsigned NOT NULL auto_increment, login varchar(50) default '', PRIMARY KEY (user_id))"); $link->query('INSERT INTO test_users VALUES (NULL, "user1"), (NULL, "user2"), (NULL, "user3"), (NULL, "user4")'); @@ -31,6 +31,17 @@ require_once('skipifconnectfailure.inc'); mysqli_query($link,"DROP TABLE test_users"); mysqli_close($link); ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_users")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- int(1) %s(5) "user1" diff --git a/ext/mysqli/tests/bug33090.phpt b/ext/mysqli/tests/bug33090.phpt index d7d569698..c95043c55 100644 --- a/ext/mysqli/tests/bug33090.phpt +++ b/ext/mysqli/tests/bug33090.phpt @@ -1,8 +1,8 @@ --TEST-- Bug #33090 (mysql_prepare doesn't return an error) --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -10,13 +10,13 @@ require_once('skipifconnectfailure.inc'); include ("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, null, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, null, $port, $socket); mysqli_select_db($link, $db); if (!($link->prepare("this makes no sense"))) { printf("%d\n", $link->errno); printf("%s\n", $link->sqlstate); - } + } $link->close(); ?> --EXPECT-- diff --git a/ext/mysqli/tests/bug34785.phpt b/ext/mysqli/tests/bug34785.phpt index 2130ccaf3..18dd4c356 100644 --- a/ext/mysqli/tests/bug34785.phpt +++ b/ext/mysqli/tests/bug34785.phpt @@ -1,8 +1,8 @@ --TEST-- Bug #34785 (Can not properly subclass mysqli_stmt) --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -24,7 +24,7 @@ require_once('skipifconnectfailure.inc'); } /*** test mysqli_connect 127.0.0.1 ***/ - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); mysqli_query($link, "SET sql_mode=''"); $stmt = new my_stmt($link, "SELECT 'foo' FROM DUAL"); diff --git a/ext/mysqli/tests/bug34810.phpt b/ext/mysqli/tests/bug34810.phpt index ed98e1e5a..fac805312 100644 --- a/ext/mysqli/tests/bug34810.phpt +++ b/ext/mysqli/tests/bug34810.phpt @@ -12,14 +12,14 @@ class DbConnection { public function connect() { include "connect.inc"; - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); var_dump($link); $link = mysqli_init(); /* @ is to supress 'Property access is not allowed yet' */ @var_dump($link); - $mysql = new mysqli($host, $user, $passwd, $db, $port, $socket); + $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); $mysql->query("DROP TABLE IF EXISTS test_warnings"); $mysql->query("CREATE TABLE test_warnings (a int not null)"); $mysql->query("SET sql_mode=''"); @@ -33,6 +33,17 @@ $db->connect(); echo "Done\n"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_warnings")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- object(mysqli)#%d (%d) { [%u|b%"affected_rows"]=> diff --git a/ext/mysqli/tests/bug35103.phpt b/ext/mysqli/tests/bug35103.phpt index b94366203..9c137b554 100644 --- a/ext/mysqli/tests/bug35103.phpt +++ b/ext/mysqli/tests/bug35103.phpt @@ -1,8 +1,8 @@ --TEST-- Bug #35103 (Bad handling of unsigned bigint) --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -14,7 +14,7 @@ DROP TABLE test_buint; EOSQL; include "connect.inc"; - $mysql = new mysqli($host, $user, $passwd, $db, $port, $socket); + $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); $mysql->query("DROP TABLE IF EXISTS test_bint"); $mysql->query("CREATE TABLE test_bint (a bigint(20) default NULL) ENGINE=MYISAM"); $mysql->query("INSERT INTO test_bint VALUES (9223372036854775807),(-9223372036854775808),(-2147483648),(-2147483649),(-2147483647),(2147483647),(2147483648),(2147483649)"); @@ -22,7 +22,7 @@ EOSQL; $mysql->query("DROP TABLE IF EXISTS test_buint"); $mysql->query("CREATE TABLE test_buint (a bigint(20) unsigned default NULL)"); $mysql->query("INSERT INTO test_buint VALUES (18446744073709551615),(9223372036854775807),(9223372036854775808),(2147483647),(2147483649),(4294967295)"); - + $stmt = $mysql->prepare("SELECT a FROM test_bint ORDER BY a"); $stmt->bind_result($v); $stmt->execute(); @@ -51,6 +51,17 @@ EOSQL; $mysql->close(); ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bint") || !mysqli_query($link, "DROP TABLE IF EXISTS test_buint")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- BIG INT SIGNED, TEST -9223372036854775808 diff --git a/ext/mysqli/tests/bug35517.phpt b/ext/mysqli/tests/bug35517.phpt index fb7f9d19c..c769eed1f 100644 --- a/ext/mysqli/tests/bug35517.phpt +++ b/ext/mysqli/tests/bug35517.phpt @@ -9,7 +9,7 @@ require_once('skipifconnectfailure.inc'); <?php include "connect.inc"; - $mysql = new mysqli($host, $user, $passwd, $db, $port, $socket); + $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); $mysql->query("CREATE TABLE temp (id INT UNSIGNED NOT NULL)"); $mysql->query("INSERT INTO temp (id) VALUES (3000000897),(3800001532),(3900002281),(3100059612)"); @@ -37,6 +37,17 @@ require_once('skipifconnectfailure.inc'); $mysql->close(); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS temp")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- 3000000897 3800001532 diff --git a/ext/mysqli/tests/bug35759.phpt b/ext/mysqli/tests/bug35759.phpt index ca8622d3a..39b21c476 100644 --- a/ext/mysqli/tests/bug35759.phpt +++ b/ext/mysqli/tests/bug35759.phpt @@ -1,8 +1,8 @@ --TEST-- Bug #35759 (mysqli_stmt_bind_result() makes huge allocation when column empty) --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -24,11 +24,11 @@ EOSQL; while (++$i < $col_num) { $create .= ", a$i MEDIUMBLOB NOT NULL DEFAULT ''"; } - $create .= ")"; - + $create .= ")"; + $mysql->query($create); $mysql->query("INSERT INTO blobby (a0) VALUES ('')"); - + $stmt = $mysql->prepare("SELECT * FROM blobby"); $stmt->execute(); $stmt->store_result(); @@ -37,7 +37,7 @@ EOSQL; } call_user_func_array(array($stmt, "bind_result"), $params); $stmt->fetch(); - + $stmt->close(); $mysql->query("DROP TABLE blobby"); @@ -45,5 +45,16 @@ EOSQL; $mysql->close(); echo "OK\n"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS blobby")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- OK diff --git a/ext/mysqli/tests/bug36420.phpt b/ext/mysqli/tests/bug36420.phpt index 49804e18a..54657a700 100644 --- a/ext/mysqli/tests/bug36420.phpt +++ b/ext/mysqli/tests/bug36420.phpt @@ -1,15 +1,15 @@ --TEST-- Bug #36420 (segfault when access result->num_rows after calling result->close()) --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php include "connect.inc"; -$mysqli = mysqli_connect($host, $user, $passwd, $db, $port, $socket); +$mysqli = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); $result = $mysqli->query('select 1'); @@ -21,7 +21,7 @@ echo $result->num_rows; echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: main(): Couldn't fetch mysqli_result in %s on line %d Warning: main(): Couldn't fetch mysqli_result in %s on line %d diff --git a/ext/mysqli/tests/bug36745.phpt b/ext/mysqli/tests/bug36745.phpt index eef65d8aa..511eaf38f 100644 --- a/ext/mysqli/tests/bug36745.phpt +++ b/ext/mysqli/tests/bug36745.phpt @@ -1,8 +1,8 @@ --TEST-- Bug #36745 (LOAD DATA LOCAL INFILE doesn't return correct error message) --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); include ("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ - $mysql = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $mysql = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); $mysql->query("DROP TABLE IF EXISTS litest"); $mysql->query("CREATE TABLE litest (a VARCHAR(20))"); @@ -21,6 +21,17 @@ require_once('skipifconnectfailure.inc'); $mysql->close(); printf("Done"); ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS litest")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- %s(%d) "%s" Done diff --git a/ext/mysqli/tests/bug36802.phpt b/ext/mysqli/tests/bug36802.phpt index b276a0a97..d7144bdda 100644 --- a/ext/mysqli/tests/bug36802.phpt +++ b/ext/mysqli/tests/bug36802.phpt @@ -4,16 +4,13 @@ Bug #36802 (crashes with with mysqli_set_charset()) <?php require_once('skipif.inc'); ?> --FILE-- <?php - - class my_mysqli extends mysqli { - function __construct() + class really_my_mysqli extends mysqli { + function __construct() { } } include "connect.inc"; - - $mysql = mysqli_init(); /* following operations should not work */ @@ -24,12 +21,10 @@ Bug #36802 (crashes with with mysqli_set_charset()) } $x[1] = @$mysql->query("SELECT 'foo' FROM DUAL"); - /* following operations should work */ + /* following operations should work */ $x[2] = ($mysql->client_version > 0); $x[3] = $mysql->errno; $mysql->close(); - - var_dump($x); ?> diff --git a/ext/mysqli/tests/bug36949.phpt b/ext/mysqli/tests/bug36949.phpt index 9362d7ff3..39909f9ef 100644 --- a/ext/mysqli/tests/bug36949.phpt +++ b/ext/mysqli/tests/bug36949.phpt @@ -1,8 +1,8 @@ --TEST-- Bug #36949 (invalid internal mysqli objects dtor) --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -47,6 +47,17 @@ class B { $A = new A(); $B = new B(); ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS my_time")) + printf("[002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- %d%d%d%d-%d%d-%d%d %d%d:%d%d:%d%d<br> %d%d%d%d-%d%d-%d%d %d%d:%d%d:%d%d<br> diff --git a/ext/mysqli/tests/bug37090.phpt b/ext/mysqli/tests/bug37090.phpt index 003ace9d1..7e8b4931b 100644 --- a/ext/mysqli/tests/bug37090.phpt +++ b/ext/mysqli/tests/bug37090.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_set_charset')) { die('skip mysqli_set_charset() not available'); } -if (ini_get('unicode.semantics')) { +if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1)) { die("skip Functionality not available in unicode mode"); } ?> @@ -15,7 +15,7 @@ if (ini_get('unicode.semantics')) { <?php include "connect.inc"; - $mysql = new mysqli($host, $user, $passwd, $db, $port, $socket); + $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); $cs = array(); $cs[] = $mysql->set_charset("latin1"); diff --git a/ext/mysqli/tests/bug38710.phpt b/ext/mysqli/tests/bug38710.phpt index 490810cbc..280a51a6f 100755 --- a/ext/mysqli/tests/bug38710.phpt +++ b/ext/mysqli/tests/bug38710.phpt @@ -1,15 +1,15 @@ --TEST-- Bug #38710 (data leakage because of nonexisting boundary checking in statements) --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php include "connect.inc"; -$db = new mysqli($host, $user, $passwd, $db, $port, $socket); +$db = new my_mysqli($host, $user, $passwd, $db, $port, $socket); $qry=$db->stmt_init(); $qry->prepare("SELECT REPEAT('a',100000)"); $qry->execute(); @@ -20,5 +20,5 @@ if ($text !== str_repeat('a', ($IS_MYSQLND || mysqli_get_server_version($db) > 5 } echo "Done"; ?> ---EXPECTF-- +--EXPECTF-- Done
\ No newline at end of file diff --git a/ext/mysqli/tests/bug42378.phpt b/ext/mysqli/tests/bug42378.phpt index fcdd7e0da..b3fd7ca52 100644 --- a/ext/mysqli/tests/bug42378.phpt +++ b/ext/mysqli/tests/bug42378.phpt @@ -152,7 +152,7 @@ memory_limit=83886080 return true; } - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect - [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); @@ -181,6 +181,10 @@ memory_limit=83886080 mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- FLOAT FORMAT(col1, 0) diff --git a/ext/mysqli/tests/bug42548.phpt b/ext/mysqli/tests/bug42548.phpt index 64c2ba31e..c9950be3a 100644 --- a/ext/mysqli/tests/bug42548.phpt +++ b/ext/mysqli/tests/bug42548.phpt @@ -5,7 +5,7 @@ Bug #42548 PROCEDURE xxx can't return a result set in the given context (works i require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); -if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error())); } if (mysqli_get_server_version($link) <= 50000) { @@ -50,6 +50,16 @@ $mysqli->query("DROP PROCEDURE p1") or die($mysqli->error); $mysqli->close(); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +mysqli_query($link, "DROP PROCEDURE IF EXISTS p1"); + +mysqli_close($link); +?> --EXPECT-- Array ( diff --git a/ext/mysqli/tests/bug44897.phpt b/ext/mysqli/tests/bug44897.phpt index 058468c10..92fc0a2e2 100644 --- a/ext/mysqli/tests/bug44897.phpt +++ b/ext/mysqli/tests/bug44897.phpt @@ -10,7 +10,7 @@ if (!stristr(mysqli_get_client_info(), 'mysqlnd')) require_once('skipifconnectfailure.inc'); require_once('connect.inc'); -if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error())); } if (mysqli_get_server_version($link) <= 50000) { @@ -72,5 +72,19 @@ if (mysqli_get_server_version($link) <= 50000) { print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_query($link, "DROP PROCEDURE IF EXISTS p"); + +mysqli_close($link); +?> + --EXPECTF-- done! diff --git a/ext/mysqli/tests/bug45019.phpt b/ext/mysqli/tests/bug45019.phpt index ae5301f73..b8828c742 100644 --- a/ext/mysqli/tests/bug45019.phpt +++ b/ext/mysqli/tests/bug45019.phpt @@ -33,103 +33,20 @@ require_once('skipifconnectfailure.inc'); $index = 0; while ($stmt->fetch()) { + /* NOTE: libmysql - http://bugs.mysql.com/bug.php?id=47483 */ if ($data[$index] != $column1) { - printf("[004] Row %d, expecting %s/%s got %s/%s\n", - $index + 1, gettype($data[$index]), $data[$index], gettype($column1), $column1); + if ($IS_MYSQLND || $index != 1) { + printf("[004] Row %d, expecting %s/%s got %s/%s\n", + $index + 1, gettype($data[$index]), $data[$index], gettype($column1), $column1); + } else { + if ($column1 != "thre") + printf("[005] Got '%s'. Please check if http://bugs.mysql.com/bug.php?id=47483 has been fixed and adapt tests bug45019.phpt/mysqli_ps_select_union.phpt", $column1); + } } $index++; } $stmt->close(); - // Regular (non-prepared) queries - print "Mixing CAST('somestring'AS CHAR), integer and CAST(integer AS CHAR)...\n"; - if (!($res = $link->query("SELECT 1 AS column1 UNION SELECT CAST('three' AS CHAR) UNION SELECT CAST(2 AS CHAR)"))) - printf("[005] [%d] %s\n", $link->errno, $link->error); - - $data = array(); - while ($row = $res->fetch_assoc()) { - $data[] = $row['column1']; - } - $res->free(); - - // Prepared Statements - if (!($stmt = $link->prepare("SELECT 1 AS column1 UNION SELECT CAST('three' AS CHAR) UNION SELECT CAST(2 AS CHAR)"))) - printf("[006] [%d] %s\n", $link->errno, $link->error); - - $column1 = null; - if (!$stmt->execute() || !$stmt->bind_result($column1)) - printf("[007] [%d] %s\n", $stmt->errno, $stmt->error); - - $index = 0; - while ($stmt->fetch()) { - if ($data[$index] != $column1) { - printf("[008] Row %d, expecting %s/%s got %s/%s\n", - $index + 1, gettype($data[$index]), $data[$index], gettype($column1), $column1); - } - var_dump($column1); - $index++; - } - $stmt->close(); - - print "Using integer only...\n"; - if (!($res = $link->query("SELECT 1 AS column1 UNION SELECT 303 UNION SELECT 2"))) - printf("[009] [%d] %s\n", $link->errno, $link->error); - - $data = array(); - while ($row = $res->fetch_assoc()) { - $data[] = $row['column1']; - } - $res->free(); - - // Prepared Statements - if (!($stmt = $link->prepare("SELECT 1 AS column1 UNION SELECT 303 UNION SELECT 2"))) - printf("[010] [%d] %s\n", $link->errno, $link->error); - - $column1 = null; - if (!$stmt->bind_result($column1) || !$stmt->execute()) - printf("[011] [%d] %s\n", $stmt->errno, $stmt->error); - - $index = 0; - while ($stmt->fetch()) { - if ($data[$index] != $column1) { - printf("[012] Row %d, expecting %s/%s got %s/%s\n", - $index + 1, gettype($data[$index]), $data[$index], gettype($column1), $column1); - } - var_dump($column1); - $index++; - } - $stmt->close(); - - print "Testing bind_param(), strings only...\n"; - $two = 'two'; - $three = 'three'; - if (!($stmt = $link->prepare("SELECT 'one' AS column1 UNION SELECT ? UNION SELECT ?"))) - printf("[013] [%d] %s\n", $stmt->errno, $stmt->error); - - $column1 = null; - if (!$stmt->bind_param('ss', $three, $two) || !$stmt->bind_result($column1) || !$stmt->execute()) - printf("[014] [%d] %s\n", $stmt->errno, $stmt->error); - - while ($stmt->fetch()) { - var_dump($column1); - } - $stmt->close(); - - print "Testing bind_param(), strings only, with CAST AS CHAR...\n"; - $two = 'two'; - $three = 'three beers are more than enough'; - if (!($stmt = $link->prepare("SELECT CAST('one' AS CHAR) AS column1 UNION SELECT CAST(? AS CHAR) UNION SELECT CAST(? AS CHAR)"))) - printf("[013] [%d] %s\n", $stmt->errno, $stmt->error); - - $column1 = null; - if (!$stmt->bind_param('ss', $three, $two) || !$stmt->bind_result($column1) || !$stmt->execute()) - printf("[014] [%d] %s\n", $stmt->errno, $stmt->error); - - while ($stmt->fetch()) { - var_dump($column1); - } - $stmt->close(); - $link->close(); print "done!"; @@ -139,20 +56,4 @@ Using CAST('somestring' AS CHAR)... %unicode|string%(3) "one" %unicode|string%(5) "three" %unicode|string%(3) "two" -Mixing CAST('somestring'AS CHAR), integer and CAST(integer AS CHAR)... -%unicode|string%(1) "1" -%unicode|string%(5) "three" -%unicode|string%(1) "2" -Using integer only... -int(1) -int(303) -int(2) -Testing bind_param(), strings only... -%unicode|string%(3) "one" -%unicode|string%(5) "three" -%unicode|string%(3) "two" -Testing bind_param(), strings only, with CAST AS CHAR... -%unicode|string%(3) "one" -%unicode|string%(32) "three beers are more than enough" -%unicode|string%(3) "two" done! diff --git a/ext/mysqli/tests/bug45289.phpt b/ext/mysqli/tests/bug45289.phpt index 2c6bbe974..50775b55c 100644 --- a/ext/mysqli/tests/bug45289.phpt +++ b/ext/mysqli/tests/bug45289.phpt @@ -7,25 +7,34 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include("connect.inc"); require('table.inc'); + $link->close(); + + $link = mysqli_init(); + if (!($link->real_connect($host, $user, $passwd, $db, $port, $socket))) + printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", + $host, $user, $db, $port, $socket); + $id = 1; if (!($stmt = $link->prepare('SELECT id, label FROM test WHERE id=? LIMIT 1'))) - printf("[001] [%d] %s\n", $link->errno, $link->error); + printf("[002] [%d] %s\n", $link->errno, $link->error); if (!$stmt->bind_param('i', $id) || !$stmt->execute()) - printf("[002] [%d] %s\n", $stmt->errno, $stmt->error); + printf("[003] [%d] %s\n", $stmt->errno, $stmt->error); if ($res = $link->store_result()) { - printf("[003] Can store result!\n"); + if ($IS_MYSQLND) + printf("[004] Can store result!\n"); + else + printf("[004] [007] http://bugs.mysql.com/bug.php?id=47485\n"); } else { - printf("[003] [%d] %s\n", $link->errno, $link->error); + printf("[004] [%d] %s\n", $link->errno, $link->error); } - - var_dump($res->fetch_assoc()); +?> +--CLEAN-- +<?php + require_once("clean_table.inc"); ?> --EXPECTF-- -[003] [0%s - -Fatal error: Call to a member function fetch_assoc() on a non-object in %s on line %d +[004] [0%s diff --git a/ext/mysqli/tests/bug46614.phpt b/ext/mysqli/tests/bug46614.phpt new file mode 100644 index 000000000..9e7822271 --- /dev/null +++ b/ext/mysqli/tests/bug46614.phpt @@ -0,0 +1,30 @@ +--TEST-- +Bug #46614 (Extended MySQLi class gives incorrect empty() result) +--SKIPIF-- +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +if (!defined("MYSQLI_ASYNC")) { + die("skip mysqlnd only"); +} +?> +--FILE-- +<?php +class MySQL_Ext extends mysqli{ + protected $fooData = array(); + + public function isEmpty() + { + $this->extData[] = 'Bar'; + return empty($this->extData); + } +} + +include ("connect.inc"); +$MySQL_Ext = new MySQL_Ext($host, $user, $passwd, $db, $port, $socket); + +$isEmpty = $MySQL_Ext->isEmpty(); +var_dump($isEmpty); +?> +--EXPECT-- +bool(false) diff --git a/ext/mysqli/tests/bug47050.phpt b/ext/mysqli/tests/bug47050.phpt index 65b677aed..0358802ba 100644 --- a/ext/mysqli/tests/bug47050.phpt +++ b/ext/mysqli/tests/bug47050.phpt @@ -12,7 +12,7 @@ if (!defined("MYSQLI_ASYNC")) { <?php include ("connect.inc"); - $link1 = mysqli_connect($host, $user, $passwd, null, $port, $socket); + $link1 = my_mysqli_connect($host, $user, $passwd, null, $port, $socket); mysqli_select_db($link1, $db); $link1->query("SELECT 'test'", MYSQLI_ASYNC); diff --git a/ext/mysqli/tests/bug48909.phpt b/ext/mysqli/tests/bug48909.phpt new file mode 100644 index 000000000..55c85a686 --- /dev/null +++ b/ext/mysqli/tests/bug48909.phpt @@ -0,0 +1,39 @@ +--TEST-- +Bug #48909 (Segmentation fault in mysqli_stmt_execute) +--SKIPIF-- +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +?> +--FILE-- +<?php + include "connect.inc"; + + if (!($link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))) + printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", + $host, $user, $db, $port, $socket); + + if (!$link->query("DROP TABLE IF EXISTS test") || + !$link->query(sprintf("CREATE TABLE test(id INT, label varchar(255)) ENGINE = %s", $engine))) + printf("[002] [%d] %s\n", $link->errno, $link->error); + + if (!$stmt = $link->prepare("INSERT INTO test(id, label) VALUES (?, ?)")) + printf("[003] [%d] %s\n", $link->errno, $link->error); + + if (!$stmt->bind_param("bb",$bvar, $bvar)) + printf("[004] [%d] %s\n", $stmt->errno, $stmt->error); + + if (!$stmt->execute()) + printf("[005] [%d] %s\n", $stmt->errno, $stmt->error); + + $stmt->close(); + $link->close(); + + echo "done"; +?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> +--EXPECTF-- +done
\ No newline at end of file diff --git a/ext/mysqli/tests/bug49027.phpt b/ext/mysqli/tests/bug49027.phpt new file mode 100644 index 000000000..35434bdd2 --- /dev/null +++ b/ext/mysqli/tests/bug49027.phpt @@ -0,0 +1,62 @@ +--TEST-- +Bug #49027 (mysqli_options() doesn't work when using mysqlnd) +--SKIPIF-- +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +?> +--FILE-- +<?php + include ("connect.inc"); + + $link = mysqli_init(); + if (!mysqli_options($link, MYSQLI_INIT_COMMAND, "SELECT 1")) { + printf("[001] Cannot set INIT_COMMAND\n"); + } + + if (!my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) { + printf("[002] Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + } + + var_dump($link->query("SELECT 42")->fetch_row()); + + if (!mysqli_query($link, "DROP TABLE IF EXISTS test") || + !mysqli_query($link, sprintf("CREATE TABLE test(id INT) ENGINE=%s", $engine))) { + printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + } + + mysqli_close($link); + + $link = mysqli_init(); + if (!mysqli_options($link, MYSQLI_INIT_COMMAND, "INSERT INTO test(id) VALUES(1)")) { + printf("[004] Cannot set INIT_COMMAND\n"); + } + + if (!my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) { + printf("[005] Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + } + + if (!$res = mysqli_query($link, "SELECT id FROM test")) + printf("[006] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + + var_dump(mysqli_fetch_assoc($res)); + + mysqli_free_result($res); + mysqli_close($link); + + print "done!"; +?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> +--EXPECTF-- +array(1) { + [0]=> + %unicode|string%(2) "42" +} +array(1) { + [%u|b%"id"]=> + %unicode|string%(1) "1" +} +done! diff --git a/ext/mysqli/tests/bug49442.phpt b/ext/mysqli/tests/bug49442.phpt new file mode 100644 index 000000000..5323a28ed --- /dev/null +++ b/ext/mysqli/tests/bug49442.phpt @@ -0,0 +1,119 @@ +--TEST-- +Bug #49422 (mysqlnd: mysqli_real_connect() and LOAD DATA INFILE crash) +--SKIPIF-- +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +?> +--INI-- +mysqli.allow_local_infile=1 +mysqli.allow_persistent=1 +mysqli.max_persistent=1 +--FILE-- +<?php + include ("connect.inc"); + + $link = mysqli_init(); + if (!my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) { + printf("[001] Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + } + + if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) { + printf("[002] Failed to drop old test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + } + + if (!mysqli_query($link, 'CREATE TABLE test(id INT, label CHAR(1), PRIMARY KEY(id)) ENGINE=' . $engine)) { + printf("[003] Failed to create test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + } + + include("local_infile_tools.inc"); + $file = create_standard_csv(4); + + if (!@mysqli_query($link, sprintf("LOAD DATA LOCAL INFILE '%s' + INTO TABLE test + FIELDS TERMINATED BY ';' OPTIONALLY ENCLOSED BY '\'' + LINES TERMINATED BY '\n'", + mysqli_real_escape_string($link, $file)))) { + printf("[005] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + } + + if (!$res = mysqli_query($link, "SELECT * FROM test ORDER BY id")) + printf("[006] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + + $rows = array(); + while ($row = mysqli_fetch_assoc($res)) { + var_dump($row); + $rows[] = $row; + } + + mysqli_free_result($res); + + mysqli_query($link, "DELETE FROM test"); + mysqli_close($link); + + if ($IS_MYSQLND) { + /* + mysqlnd makes a connection created through mysql_init()/mysqli_real_connect() always a 'persistent' one. + At this point 'persistent' is not to be confused with what a user calls a 'persistent' - in this case + 'persistent' means that mysqlnd uses malloc() instead of emalloc(). nothing else. ext/mysqli will + not consider it as a 'persistent' connection in a user sense, ext/mysqli will not appy max_persistent etc. + Its only about malloc() vs. emalloc(). + + However, the bug is about malloc() and efree(). You can make make mysqlnd use malloc() by either using + pconnect or mysql_init() - so we should test pconnect as well.. + */ + $host = 'p:' . $host; + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + printf("[007] Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + } + + /* bug happened during query processing */ + if (!@mysqli_query($link, sprintf("LOAD DATA LOCAL INFILE '%s' + INTO TABLE test + FIELDS TERMINATED BY ';' OPTIONALLY ENCLOSED BY '\'' + LINES TERMINATED BY '\n'", + mysqli_real_escape_string($link, $file)))) { + printf("[008] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + } + + /* we survived? that's good enough... */ + + if (!$res = mysqli_query($link, "SELECT * FROM test ORDER BY id")) + printf("[009] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + + $i = 0; + while ($row = mysqli_fetch_assoc($res)) { + if (($row['id'] != $rows[$i]['id']) || ($row['label'] != $rows[$i]['label'])) { + printf("[010] Wrong values, check manually!\n"); + } + $i++; + } + mysqli_close($link); + } + + print "done!"; +?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> +--EXPECTF-- +array(2) { + [%u|b%"id"]=> + %unicode|string%(2) "97" + [%u|b%"label"]=> + %unicode|string%(1) "x" +} +array(2) { + [%u|b%"id"]=> + %unicode|string%(2) "98" + [%u|b%"label"]=> + %unicode|string%(1) "y" +} +array(2) { + [%u|b%"id"]=> + %unicode|string%(2) "99" + [%u|b%"label"]=> + %unicode|string%(1) "z" +} +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/clean_table.inc b/ext/mysqli/tests/clean_table.inc new file mode 100644 index 000000000..716cc8441 --- /dev/null +++ b/ext/mysqli/tests/clean_table.inc @@ -0,0 +1,14 @@ +<?PHP +require_once('connect.inc'); + +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + printf("[clean] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", + $host, $user, $db, $port, $socket); +} + +if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) { + printf("[clean] Failed to drop old test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link)); +} + +mysqli_close($link); +?>
\ No newline at end of file diff --git a/ext/mysqli/tests/connect.inc b/ext/mysqli/tests/connect.inc index 9bb9836b7..ad2428647 100644 --- a/ext/mysqli/tests/connect.inc +++ b/ext/mysqli/tests/connect.inc @@ -16,6 +16,7 @@ $engine = getenv("MYSQL_TEST_ENGINE") ? getenv("MYSQL_TEST_ENGINE") : "MyISAM"; $socket = getenv("MYSQL_TEST_SOCKET") ? getenv("MYSQL_TEST_SOCKET") : null; $skip_on_connect_failure = getenv("MYSQL_TEST_SKIP_CONNECT_FAILURE") ? getenv("MYSQL_TEST_SKIP_CONNECT_FAILURE") : true; + $connect_flags = getenv("MYSQL_TEST_CONNECT_FLAGS") ? (int)getenv("MYSQL_TEST_CONNECT_FLAGS") : 0; /* Development setting: test experimal features and/or feature requests that never worked before? */ $TEST_EXPERIMENTAL = (in_array(getenv("MYSQL_TEST_EXPERIMENTAL"), array(0, 1))) ? @@ -26,11 +27,31 @@ if (!$IS_MYSQLND) { $MYSQLND_VERSION = NULL; } else { + /* + The formatting of the version reported by mysqli_get_client_info() + has changed significantly in the past. To get tests working properly + with PHP 5.3.0 and up, we set everything that looks like prior to + PHP 5.3.0 to version 5.0.4 = 5 * 10000 + 0 * 100 + 4 = 50004. + PHP 5.3.0 reports mysqlnd 5.0.5 dev (= 5 * 10000 + 0 * 100 + 5 = 50005. + */ if (preg_match('@Revision:\s+(\d+)\s*\$@ism', mysqli_get_client_info(), $matches)) { - $MYSQLND_VERSION = (int)$matches[1]; + /* something prior to PHP 5.3.0 */ + $MYSQLND_VERSION = 50004; + } else if (preg_match('@^mysqlnd (\d+)\.(\d+)\.(\d+).*@ism', mysqli_get_client_info(), $matches)) { + /* formatting schema used by PHP 5.3.0 */ + $MYSQLND_VERSION = (int)$matches[1] * 10000 + (int)$matches[2] * 100 + (int)$matches[3]; + } else if (preg_match('@^mysqlnd/PHP 6.0.0-dev@ism', mysqli_get_client_info(), $matches)) { + /* + PHP 6.0 at the time of the first PHP 5.3.0 release. + HEAD and 5.3 have been in sync when 5.3.0 was released. + It is at least 5.0.5-dev. + */ + $MYSQLND_VERSION = 50005; } else { + /* unknown */ $MYSQLND_VERSION = -1; } + } if (!function_exists('sys_get_temp_dir')) { @@ -52,4 +73,54 @@ return FALSE; } } + + /** + * Whenever possible, please use this wrapper to make testing ot MYSQLI_CLIENT_COMPRESS (and potentially SSL) possible + * + * @param enable_env_flags Enable setting of connection flags through env(MYSQL_TEST_CONNECT_FLAGS)? + */ + function my_mysqli_connect($host, $user, $passwd, $db, $port, $socket, $enable_env_flags = true) { + global $connect_flags; + + $flags = ($enable_env_flags) ? $connect_flags : false; + + if ($flags !== false) { + $link = mysqli_init(); + if (!mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket, $flags)) + $link = false; + } else { + $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + } + + return $link; + } + + /** + * Whenever possible, please use this wrapper to make testing ot MYSQLI_CLIENT_COMPRESS (and potentially SSL) possible + * + * @param enable_env_flags Enable setting of connection flags through env(MYSQL_TEST_CONNECT_FLAGS) + */ + function my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket, $flags = 0, $enable_env_flags = true) { + global $connect_flags; + + if ($enable_env_flags) + $flags & $connect_flags; + + return mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket, $flags); + } + + class my_mysqli extends mysqli { + public function __construct($host, $user, $passwd, $db, $port, $socket, $enable_env_flags = true) { + global $connect_flags; + + $flags = ($enable_env_flags) ? $connect_flags : false; + + if ($flags !== false) { + parent::init(); + $this->real_connect($host, $user, $passwd, $db, $port, $socket, $flags); + } else { + parent::__construct($host, $user, $passwd, $db, $port, $socket); + } + } + } ?>
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_affected_rows.phpt b/ext/mysqli/tests/mysqli_affected_rows.phpt index 24762cc99..6cb5451c0 100644 --- a/ext/mysqli/tests/mysqli_affected_rows.phpt +++ b/ext/mysqli/tests/mysqli_affected_rows.phpt @@ -22,7 +22,7 @@ mysqli_affected_rows() if (!is_null($tmp = @mysqli_affected_rows($link, $link))) printf("[003] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[004] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -127,5 +127,9 @@ mysqli_affected_rows() print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_affected_rows_oo.phpt b/ext/mysqli/tests/mysqli_affected_rows_oo.phpt index bdbb790b1..07b7bcb48 100644 --- a/ext/mysqli/tests/mysqli_affected_rows_oo.phpt +++ b/ext/mysqli/tests/mysqli_affected_rows_oo.phpt @@ -14,7 +14,7 @@ mysqli->affected_rows if (NULL !== ($tmp = @$mysqli->affected_rows)) printf("[000a] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); - if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket)) { + if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) { printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); } @@ -106,5 +106,9 @@ mysqli->affected_rows print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_autocommit.phpt b/ext/mysqli/tests/mysqli_autocommit.phpt index f409baadc..cdd555976 100644 --- a/ext/mysqli/tests/mysqli_autocommit.phpt +++ b/ext/mysqli/tests/mysqli_autocommit.phpt @@ -7,7 +7,7 @@ mysqli_autocommit() require_once('connect.inc'); require_once('skipifconnectfailure.inc'); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { die(sprintf("skip Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket)); } @@ -40,7 +40,7 @@ mysqli_autocommit() if (!is_null($tmp = @mysqli_autocommit($link, $link, $link))) printf("[003] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { printf("[004] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); } @@ -148,5 +148,9 @@ mysqli_autocommit() print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! diff --git a/ext/mysqli/tests/mysqli_autocommit_oo.phpt b/ext/mysqli/tests/mysqli_autocommit_oo.phpt index 006a5d4ba..8f2c4b472 100644 --- a/ext/mysqli/tests/mysqli_autocommit_oo.phpt +++ b/ext/mysqli/tests/mysqli_autocommit_oo.phpt @@ -7,7 +7,7 @@ mysqli->autocommit() require_once('skipifconnectfailure.inc'); require_once('connect.inc'); - if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket)) { + if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) { printf("skip Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); exit(1); @@ -31,7 +31,7 @@ mysqli->autocommit() <?php include "connect.inc"; - if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket)) { + if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) { printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); } @@ -140,5 +140,9 @@ mysqli->autocommit() print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_change_user.phpt b/ext/mysqli/tests/mysqli_change_user.phpt index dce00eba6..d889ec820 100644 --- a/ext/mysqli/tests/mysqli_change_user.phpt +++ b/ext/mysqli/tests/mysqli_change_user.phpt @@ -2,7 +2,7 @@ mysqli_change_user() --SKIPIF-- <?php -require_once('skipif.inc'); +require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> @@ -28,7 +28,7 @@ require_once('skipifconnectfailure.inc'); if (!is_null($tmp = @mysqli_change_user($link, $link, $link, $link, $link))) printf("[005] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[006] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); diff --git a/ext/mysqli/tests/mysqli_change_user_get_lock.phpt b/ext/mysqli/tests/mysqli_change_user_get_lock.phpt index 437e39304..4cc071d7a 100644 --- a/ext/mysqli/tests/mysqli_change_user_get_lock.phpt +++ b/ext/mysqli/tests/mysqli_change_user_get_lock.phpt @@ -70,7 +70,7 @@ sleep(5); /* Ok, let's try a NEW connection and a NEW lock! */ mysqli_close($link); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[010] Cannot open new connection, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); @@ -93,6 +93,10 @@ sleep(5); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Testing GET_LOCK()... ... lock 'phptest_%d' acquired by thread %d diff --git a/ext/mysqli/tests/mysqli_change_user_insert_id.phpt b/ext/mysqli/tests/mysqli_change_user_insert_id.phpt index bbdfc578b..83efb5149 100644 --- a/ext/mysqli/tests/mysqli_change_user_insert_id.phpt +++ b/ext/mysqli/tests/mysqli_change_user_insert_id.phpt @@ -7,7 +7,7 @@ require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); if (!$IS_MYSQLND) { - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Can't test server version, might hit known bugs http://bugs.mysql.com/bug.php?id=30472, http://bugs.mysql.com/bug.php?id=45184"); if (mysqli_get_client_version($link) <= 50135) /* TODO - check wich version got the patch */ @@ -20,7 +20,7 @@ if (!$IS_MYSQLND) { <?php require_once('connect.inc'); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) @@ -62,5 +62,9 @@ if (!$IS_MYSQLND) { mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- 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 43fa433d0..e40154ce1 100644 --- a/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt +++ b/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt @@ -12,7 +12,7 @@ die("skip - is the server still buggy?"); require_once('connect.inc'); require_once('table.inc'); - if (!$link2 = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link2 = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot create second connection handle, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); @@ -99,5 +99,9 @@ die("skip - is the server still buggy?"); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! diff --git a/ext/mysqli/tests/mysqli_change_user_oo.phpt b/ext/mysqli/tests/mysqli_change_user_oo.phpt index cb7bcf7e8..61444ae23 100644 --- a/ext/mysqli/tests/mysqli_change_user_oo.phpt +++ b/ext/mysqli/tests/mysqli_change_user_oo.phpt @@ -18,7 +18,7 @@ if (!$IS_MYSQLND && (mysqli_get_server_version($link) < 50118 && mysqli_get_serv $link = NULL; $tmp = NULL; - if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket)) + if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); diff --git a/ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt b/ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt index aa8eb4176..6a37b6b44 100644 --- a/ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt +++ b/ext/mysqli/tests/mysqli_change_user_prepared_statements.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); <?php require_once('connect.inc'); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); if (!$stmt = mysqli_prepare($link, "SELECT 'prepared statements should be released'")) diff --git a/ext/mysqli/tests/mysqli_change_user_rollback.phpt b/ext/mysqli/tests/mysqli_change_user_rollback.phpt index ae1d91180..a57f80b67 100644 --- a/ext/mysqli/tests/mysqli_change_user_rollback.phpt +++ b/ext/mysqli/tests/mysqli_change_user_rollback.phpt @@ -6,7 +6,7 @@ require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); -$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); +$link = my_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); @@ -66,5 +66,9 @@ if ($row[1] == 'NO') { mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- 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 d734ee886..362873c84 100644 --- a/ext/mysqli/tests/mysqli_change_user_set_names.phpt +++ b/ext/mysqli/tests/mysqli_change_user_set_names.phpt @@ -6,7 +6,7 @@ require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); -if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die(sprintf("skip [%d] %s", mysqli_connect_errno(), mysqli_connect_error())); if (!$res = mysqli_query($link, 'SELECT version() AS server_version')) @@ -25,7 +25,7 @@ if ($version[0] <= 4 && $version[1] < 1) <?php require_once('connect.inc'); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); if (!$res = mysqli_query($link, "SHOW CHARACTER SET LIKE 'latin%'")) diff --git a/ext/mysqli/tests/mysqli_character_set.phpt b/ext/mysqli/tests/mysqli_character_set.phpt index 4823f51d5..11c92ce63 100644 --- a/ext/mysqli/tests/mysqli_character_set.phpt +++ b/ext/mysqli/tests/mysqli_character_set.phpt @@ -20,7 +20,7 @@ if (version_compare(PHP_VERSION, '5.9.9', '>') == 1) { $tmp = NULL; $link = NULL; - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -100,5 +100,9 @@ if (version_compare(PHP_VERSION, '5.9.9', '>') == 1) { print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! diff --git a/ext/mysqli/tests/mysqli_character_set_name.phpt b/ext/mysqli/tests/mysqli_character_set_name.phpt index 03bc31159..9a40099fe 100644 --- a/ext/mysqli/tests/mysqli_character_set_name.phpt +++ b/ext/mysqli/tests/mysqli_character_set_name.phpt @@ -1,8 +1,8 @@ --TEST-- mysqli_chararcter_set_name(), mysql_client_encoding() [alias] --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> @@ -23,7 +23,7 @@ require_once('skipifconnectfailure.inc'); if (!is_null($tmp = @mysqli_character_set_name($link, $link, $link))) printf("[003] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[005] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); diff --git a/ext/mysqli/tests/mysqli_character_set_name_oo.phpt b/ext/mysqli/tests/mysqli_character_set_name_oo.phpt index 018a90ad8..a56cf6ae8 100644 --- a/ext/mysqli/tests/mysqli_character_set_name_oo.phpt +++ b/ext/mysqli/tests/mysqli_character_set_name_oo.phpt @@ -1,7 +1,7 @@ --TEST-- mysqli_chararcter_set_name(), mysql_client_encoding() [alias] --SKIPIF-- -<?php +<?php require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); @@ -14,7 +14,7 @@ mysqli_chararcter_set_name(), mysql_client_encoding() [alias] $tmp = NULL; $link = NULL; - if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket)) + if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); diff --git a/ext/mysqli/tests/mysqli_class_mysqli_driver_reflection.phpt b/ext/mysqli/tests/mysqli_class_mysqli_driver_reflection.phpt index 8a59549e5..2e6d9c2fd 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_driver_reflection.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_driver_reflection.phpt @@ -15,8 +15,6 @@ Those tests go into the details and are aimed to be a development tool, no more. */ if (!$IS_MYSQLND) die("skip Test has been written for the latest version of mysqlnd only"); -if ($MYSQLND_VERSION < 576) - die("skip Test requires mysqlnd Revision 576 or newer"); ?> --FILE-- <?php diff --git a/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt index b0c732a0d..ad914b734 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt @@ -11,7 +11,7 @@ require_once('skipifconnectfailure.inc'); require('connect.inc'); $mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket); - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); printf("Parent class:\n"); var_dump(get_parent_class($mysqli)); @@ -194,7 +194,7 @@ require_once('skipifconnectfailure.inc'); @$mysqli->unknown = $unknown; printf("setting mysqli->unknown, mysqli_unknown = '%s'\n", @$mysqli->unknown); - $mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket); + $mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket); printf("\nAccess hidden properties for MYSLQI_STATUS_INITIALIZED (TODO documentation):\n"); assert(mysqli_connect_error() === $mysqli->connect_error); printf("mysqli->connect_error = '%s'/%s ('%s'/%s)\n", diff --git a/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt b/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt index 51dc05ed5..802e52433 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt @@ -15,8 +15,8 @@ Those tests go into the details and are aimed to be a development tool, no more. */ if (!$IS_MYSQLND) die("skip Test has been written for the latest version of mysqlnd only"); -if ($MYSQLND_VERSION < 576) - die("skip Test requires mysqlnd Revision 576 or newer"); +if ($MYSQLND_VERSION < 50004) + die("skip Test requires mysqlnd Revision 5.0.4 or newer"); ?> --FILE-- @@ -423,6 +423,22 @@ Modifiers: 256 Number of Parameters: 0 Number of Required Parameters: 0 +Inspecting method 'poll' +isFinal: no +isAbstract: no +isPublic: yes +isPrivate: no +isProtected: no +isStatic: no +isConstructor: no +isDestructor: no +isInternal: yes +isUserDefined: no +returnsReference: no +Modifiers: 256 +Number of Parameters: 0 +Number of Required Parameters: 0 + Inspecting method 'prepare' isFinal: no isAbstract: no @@ -503,6 +519,38 @@ Modifiers: 256 Number of Parameters: 0 Number of Required Parameters: 0 +Inspecting method 'reap_async_query' +isFinal: no +isAbstract: no +isPublic: yes +isPrivate: no +isProtected: no +isStatic: no +isConstructor: no +isDestructor: no +isInternal: yes +isUserDefined: no +returnsReference: no +Modifiers: 256 +Number of Parameters: 0 +Number of Required Parameters: 0 + +Inspecting method 'refresh' +isFinal: no +isAbstract: no +isPublic: yes +isPrivate: no +isProtected: no +isStatic: no +isConstructor: no +isDestructor: no +isInternal: yes +isUserDefined: no +returnsReference: no +Modifiers: 256 +Number of Parameters: 0 +Number of Required Parameters: 0 + Inspecting method 'rollback' isFinal: no isAbstract: no @@ -799,5 +847,4 @@ Default property 'server_version' Default property 'sqlstate' Default property 'thread_id' Default property 'warning_count' -done! - +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt index de4fb87ca..b327fe656 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt @@ -11,11 +11,11 @@ require_once('skipifconnectfailure.inc'); require('connect.inc'); require('table.inc'); - $mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket); + $mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket); $mysqli_result = $mysqli->query('SELECT * FROM test'); $row = $mysqli_result->fetch_row(); - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); $res = mysqli_query($link, 'SELECT * FROM test'); assert(mysqli_fetch_row($res) === $row); diff --git a/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt b/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt index 5f26d1eb5..cf5973249 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt @@ -17,8 +17,8 @@ Those tests go into the details and are aimed to be a development tool, no more. */ if (!$IS_MYSQLND) die("skip Test has been written for the latest version of mysqlnd only"); -if ($MYSQLND_VERSION < 576) - die("skip Test requires mysqlnd Revision 576 or newer"); +if ($MYSQLND_VERSION < 50004) + die("skip Test requires mysqlnd Revision 5.0.4 or newer"); ?> --FILE-- <?php diff --git a/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt index 2b6343c43..9ddb26e89 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt @@ -11,7 +11,7 @@ Interface of the class mysqli_stmt require('connect.inc'); require('table.inc'); - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); $stmt = new mysqli_stmt($link); printf("Parent class:\n"); @@ -187,5 +187,5 @@ stmt->unknown = '13' Prepare using the constructor: -Warning: mysqli_stmt::__construct() expects parameter 2 to be string, object given in %s on line %d +Warning: mysqli_stmt::__construct() expects parameter 2 to be %binary_string_optional%, object given in %s on line %d done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt b/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt index 0d1d3a017..62f01cac6 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt @@ -21,7 +21,7 @@ if (!$TEST_EXPERIMENTAL) $mysqli = new mysqli(); $warning = new mysqli_warning($mysqli); - $mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket); + $mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket); $stmt = new mysqli_stmt($mysqli); $warning = new mysqli_warning($stmt); @@ -32,7 +32,7 @@ if (!$TEST_EXPERIMENTAL) $warning = new mysqli_warning($obj); include("table.inc"); - $mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket); + $mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket); $res = $mysqli->query('INSERT INTO test(id, label) VALUES (1, "zz")'); $warning = mysqli_get_warnings($mysqli); @@ -89,6 +89,10 @@ if (!$TEST_EXPERIMENTAL) print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: Wrong parameter count for mysqli_warning::mysqli_warning() in %s on line %d diff --git a/ext/mysqli/tests/mysqli_class_mysqli_warning_reflection.phpt b/ext/mysqli/tests/mysqli_class_mysqli_warning_reflection.phpt index cb690437a..dc0c14e6e 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_warning_reflection.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_warning_reflection.phpt @@ -16,8 +16,8 @@ Those tests go into the details and are aimed to be a development tool, no more. */ if (!$IS_MYSQLND) die("skip Test has been written for the latest version of mysqlnd only"); -if ($MYSQLND_VERSION < 576) - die("skip Test requires mysqlnd Revision 576 or newer"); +if ($MYSQLND_VERSION < 50004) + die("skip Test requires mysqlnd Revision 5.0.4 or newer"); ?> --FILE-- <?php diff --git a/ext/mysqli/tests/mysqli_close.phpt b/ext/mysqli/tests/mysqli_close.phpt index 24e4a35c9..713c6e157 100644 --- a/ext/mysqli/tests/mysqli_close.phpt +++ b/ext/mysqli/tests/mysqli_close.phpt @@ -1,9 +1,9 @@ --TEST-- mysqli_close() --SKIPIF-- -<?php -require_once('skipif.inc'); -require_once('skipifemb.inc'); +<?php +require_once('skipif.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -19,7 +19,7 @@ require_once('skipifconnectfailure.inc'); if (!is_null($tmp = @mysqli_close($link, $link))) printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[003] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); diff --git a/ext/mysqli/tests/mysqli_close_oo.phpt b/ext/mysqli/tests/mysqli_close_oo.phpt index 706767458..c3d6a9397 100644 --- a/ext/mysqli/tests/mysqli_close_oo.phpt +++ b/ext/mysqli/tests/mysqli_close_oo.phpt @@ -1,9 +1,9 @@ --TEST-- mysqli_close() --SKIPIF-- -<?php -require_once('skipif.inc'); -require_once('skipifemb.inc'); +<?php +require_once('skipif.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -13,7 +13,7 @@ require_once('skipifconnectfailure.inc'); $tmp = NULL; $link = NULL; - if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket)) + if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); diff --git a/ext/mysqli/tests/mysqli_commit.phpt b/ext/mysqli/tests/mysqli_commit.phpt index e19e63564..6a3c1e86c 100644 --- a/ext/mysqli/tests/mysqli_commit.phpt +++ b/ext/mysqli/tests/mysqli_commit.phpt @@ -1,12 +1,12 @@ --TEST-- mysqli_commit() --SKIPIF-- -<?php -require_once('skipif.inc'); -require_once('skipifemb.inc'); +<?php +require_once('skipif.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); -if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { die(sprintf("skip Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket)); } @@ -39,7 +39,7 @@ if ($row[1] == "DISABLED" || $row[1] == "NO") { if (!is_null($tmp = @mysqli_commit($link, $link))) printf("[003] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[004] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -79,5 +79,9 @@ if ($row[1] == "DISABLED" || $row[1] == "NO") { print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_commit_oo.phpt b/ext/mysqli/tests/mysqli_commit_oo.phpt index 7323db78f..8d072999c 100644 --- a/ext/mysqli/tests/mysqli_commit_oo.phpt +++ b/ext/mysqli/tests/mysqli_commit_oo.phpt @@ -1,11 +1,11 @@ --TEST-- mysqli_commit() --SKIPIF-- -<?php -require_once('skipif.inc'); -require_once('skipifemb.inc'); +<?php +require_once('skipif.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); -if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket)) { +if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) { die(sprintf("skip Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket)); } @@ -33,7 +33,7 @@ if ($row[1] == "DISABLED" || $row[1] == "NO") { if (!is_null($tmp = @$mysqli->commit())) printf("[013] Expecting NULL got %s/%s\n", gettype($tmp), $tmp); - if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket)) + if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -80,5 +80,9 @@ if ($row[1] == "DISABLED" || $row[1] == "NO") { print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_connect_errno.phpt b/ext/mysqli/tests/mysqli_connect_errno.phpt index f1b1d7b01..b48a75ef8 100644 --- a/ext/mysqli/tests/mysqli_connect_errno.phpt +++ b/ext/mysqli/tests/mysqli_connect_errno.phpt @@ -1,9 +1,9 @@ --TEST-- mysqli_connect_errno() --SKIPIF-- -<?php -require_once('skipif.inc'); -require_once('skipifemb.inc'); +<?php +require_once('skipif.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -17,7 +17,7 @@ require_once('skipifconnectfailure.inc'); if (0 !== ($tmp = @mysqli_connect_errno($link))) printf("[001] Expecting integer/0, got %s/%s\n", gettype($tmp), $tmp); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[002] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -26,10 +26,10 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); - $link = @mysqli_connect($host, $user . 'unknown_really', $passwd . 'non_empty', $db, $port, $socket); + $link = @my_mysqli_connect($host, $user . 'unknown_really', $passwd . 'non_empty', $db, $port, $socket); if (false !== $link) printf("[004] Connect to the server should fail using host=%s, user=%s, passwd=***non_empty, dbname=%s, port=%s, socket=%s, expecting boolean/false, got %s/%s\n", - $host, $user . 'unknown_really', $db, $port, $socket, gettype($link), $link); + $host, $user . 'unknown_really', $db, $port, $socket, gettype($link), var_export($link, true)); if (0 === ($tmp = mysqli_connect_errno())) printf("[005] Expecting integer/any non-zero, got %s/%s\n", gettype($tmp), $tmp); diff --git a/ext/mysqli/tests/mysqli_connect_error.phpt b/ext/mysqli/tests/mysqli_connect_error.phpt index 5016acf24..e65dc0eb0 100644 --- a/ext/mysqli/tests/mysqli_connect_error.phpt +++ b/ext/mysqli/tests/mysqli_connect_error.phpt @@ -1,9 +1,9 @@ --TEST-- mysqli_connect_error() --SKIPIF-- -<?php -require_once('skipif.inc'); -require_once('skipifemb.inc'); +<?php +require_once('skipif.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -17,7 +17,7 @@ require_once('skipifconnectfailure.inc'); if (!is_null($tmp = @mysqli_connect_error($link))) printf("[001] Expecting NULL/NULL, got %s/%s\n", gettype($tmp), $tmp); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[002] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -26,7 +26,7 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); - if ($link = @mysqli_connect($host, $user . 'unknown_really', $passwd . 'non_empty', $db, $port, $socket)) + if ($link = @my_mysqli_connect($host, $user . 'unknown_really', $passwd . 'non_empty', $db, $port, $socket)) printf("[003] Connect to the server should fail using host=%s, user=%s, passwd=***non_empty, dbname=%s, port=%s, socket=%s\n", $host, $user . 'unknown_really', $db, $port, $socket); diff --git a/ext/mysqli/tests/mysqli_connect_twice.phpt b/ext/mysqli/tests/mysqli_connect_twice.phpt index debc435b0..7c6a726b2 100644 --- a/ext/mysqli/tests/mysqli_connect_twice.phpt +++ b/ext/mysqli/tests/mysqli_connect_twice.phpt @@ -10,14 +10,14 @@ require_once('skipifconnectfailure.inc'); <?php include "connect.inc"; - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); if (!$thread_id = mysqli_thread_id($link)) printf("[002] Cannot determine thread id, test will fail, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - if (true !== ($tmp = mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket))) + if (true !== ($tmp = my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket))) printf("[003] Expecting boolean/true got %s/%s\n", gettype($tmp), $tmp); if (!is_int($new_thread_id = mysqli_thread_id($link)) || ($new_thread_id < 0)) @@ -35,7 +35,7 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); - if (!$link = new mysqli($host, $user, $passwd, $db, $port, $socket)) + if (!$link = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) printf("[007] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); diff --git a/ext/mysqli/tests/mysqli_constants_categories.phpt b/ext/mysqli/tests/mysqli_constants_categories.phpt index 3fd6e51a8..e51325a21 100644 --- a/ext/mysqli/tests/mysqli_constants_categories.phpt +++ b/ext/mysqli/tests/mysqli_constants_categories.phpt @@ -4,21 +4,15 @@ Constants exported by ext/mysqli - checking category - PHP bug not mysqli bug (c <?php require_once('skipif.inc'); require_once('skipifemb.inc'); -require_once('connect.inc'); -if (!$TEST_EXPERIMENTAL) - die("skip This hits a known PHP bug, run the test from time to time and enable it once PHP got fixed"); ?> --FILE-- <?php - require("connect.inc"); - require("table.inc"); - $constants = get_defined_constants(true); foreach ($constants as $group => $consts) { foreach ($consts as $name => $value) { if (stristr($name, 'mysqli')) { - if ('mysqli' !== $group) + if ('mysqli' != $group) printf("found constant '%s' in group '%s'. expecting group 'mysqli'\n", $name, $group); } } diff --git a/ext/mysqli/tests/mysqli_data_seek.phpt b/ext/mysqli/tests/mysqli_data_seek.phpt index d25347ade..cb54c8003 100644 --- a/ext/mysqli/tests/mysqli_data_seek.phpt +++ b/ext/mysqli/tests/mysqli_data_seek.phpt @@ -63,6 +63,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_data_seek(): Function cannot be used with MYSQL_USE_RESULT in %s on line %d diff --git a/ext/mysqli/tests/mysqli_data_seek_oo.phpt b/ext/mysqli/tests/mysqli_data_seek_oo.phpt index 40fabe1ce..e75a04f36 100644 --- a/ext/mysqli/tests/mysqli_data_seek_oo.phpt +++ b/ext/mysqli/tests/mysqli_data_seek_oo.phpt @@ -72,6 +72,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_result::data_seek(): Function cannot be used with MYSQL_USE_RESULT in %s on line %d diff --git a/ext/mysqli/tests/mysqli_debug.phpt b/ext/mysqli/tests/mysqli_debug.phpt index da41894b1..2b754eac3 100644 --- a/ext/mysqli/tests/mysqli_debug.phpt +++ b/ext/mysqli/tests/mysqli_debug.phpt @@ -61,5 +61,9 @@ if (defined('MYSQLI_DEBUG_TRACE_ENABLED') && !MYSQLI_DEBUG_TRACE_ENABLED) print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done%s diff --git a/ext/mysqli/tests/mysqli_debug_append.phpt b/ext/mysqli/tests/mysqli_debug_append.phpt index 671b3821e..f15365f2e 100644 --- a/ext/mysqli/tests/mysqli_debug_append.phpt +++ b/ext/mysqli/tests/mysqli_debug_append.phpt @@ -82,5 +82,9 @@ if (defined('MYSQLI_DEBUG_TRACE_ENABLED') && !MYSQLI_DEBUG_TRACE_ENABLED) if ($IS_MYSQLND) print "libmysql/DBUG package prints some debug info here." ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done%s diff --git a/ext/mysqli/tests/mysqli_debug_ini.phpt b/ext/mysqli/tests/mysqli_debug_ini.phpt index 7581385a9..859a44c32 100644 --- a/ext/mysqli/tests/mysqli_debug_ini.phpt +++ b/ext/mysqli/tests/mysqli_debug_ini.phpt @@ -15,8 +15,8 @@ if (defined('MYSQLI_DEBUG_TRACE_ENABLED') && !MYSQLI_DEBUG_TRACE_ENABLED) die("skip: debug functionality not enabled"); require_once('connect.inc'); -if (!$IS_MYSQLND || ($MYSQLND_VERSION < 940)) - die("skip needs mysqlnd version/revision 940+"); +if (!$IS_MYSQLND || ($MYSQLND_VERSION < 50004)) + die("skip needs mysqlnd version/revision 5.0.4"); if (!$fp = @fopen('/tmp/mysqli_debug_phpt.trace', 'w')) die("skip PHP cannot create a file in /tmp/mysqli_debug_phpt"); diff --git a/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt b/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt index db9ceb382..9b43e15bd 100644 --- a/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt +++ b/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt @@ -218,6 +218,10 @@ if (defined('MYSQLI_DEBUG_TRACE_ENABLED') && !MYSQLI_DEBUG_TRACE_ENABLED) print "libmysql/DBUG package prints some debug info here."; @unlink($trace_file); ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- [083][control string 'n:O,/tmp/mysqli_debug_phpt.trace'] Trace file has not been written. done%s diff --git a/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt b/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt index fc9f7a802..8ecf516ca 100644 --- a/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt +++ b/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt @@ -120,5 +120,9 @@ if (!$IS_MYSQLND) @unlink($trace_file); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt b/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt index 80a37f8f9..79f081f50 100644 --- a/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt +++ b/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt @@ -23,7 +23,7 @@ if (!function_exists('mysqli_disable_reads_from_master')) { if (NULL !== ($tmp = @mysqli_disable_reads_from_master($link))) printf("[002] Expecting NULL/NULL, got %s/%s\n", gettype($tmp), $tmp); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { printf("[003] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); } @@ -38,6 +38,10 @@ if (!function_exists('mysqli_disable_reads_from_master')) { print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_disable_reads_from_master(): Couldn't fetch mysqli in %s on line %d done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_driver.phpt b/ext/mysqli/tests/mysqli_driver.phpt index 765fee527..a2d1437a2 100644 --- a/ext/mysqli/tests/mysqli_driver.phpt +++ b/ext/mysqli/tests/mysqli_driver.phpt @@ -46,7 +46,7 @@ require_once('skipifconnectfailure.inc'); $ok = false; try { - if ($link = mysqli_connect($host, $user . 'unknown_really', $passwd . 'non_empty', $db, $port, $socket)) + if ($link = my_mysqli_connect($host, $user . 'unknown_really', $passwd . 'non_empty', $db, $port, $socket)) printf("[007] Can connect to the server using host=%s, user=%s, passwd=***non_empty, dbname=%s, port=%s, socket=%s\n", $host, $user . 'unknown_really', $db, $port, $socket); mysqli_close($link); @@ -75,14 +75,14 @@ require_once('skipifconnectfailure.inc'); $driver->report_mode = MYSQLI_REPORT_OFF; - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[016] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); mysqli_query($link, "NO_SQL"); mysqli_close($link); $driver->report_mode = MYSQLI_REPORT_ERROR; - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[017] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); mysqli_query($link, "NO_SQL"); mysqli_close($link); diff --git a/ext/mysqli/tests/mysqli_dump_debug_info.phpt b/ext/mysqli/tests/mysqli_dump_debug_info.phpt index d93738edc..fe253e1cf 100644 --- a/ext/mysqli/tests/mysqli_dump_debug_info.phpt +++ b/ext/mysqli/tests/mysqli_dump_debug_info.phpt @@ -19,7 +19,7 @@ require_once('skipifconnectfailure.inc'); if (NULL !== ($tmp = @mysqli_dump_debug_info($link))) printf("[002] Expecting NULL/NULL, got %s/%s\n", gettype($tmp), $tmp); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { printf("[003] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); exit(1); diff --git a/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt b/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt index 2228f3d6c..171ed5650 100644 --- a/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt +++ b/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt @@ -1,8 +1,8 @@ --TEST-- mysqli_enable_reads_from_master() --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); @@ -23,7 +23,7 @@ if (!function_exists('mysqli_enable_reads_from_master')) { if (NULL !== ($tmp = @mysqli_enable_reads_from_master($link))) printf("[002] Expecting NULL/NULL, got %s/%s\n", gettype($tmp), $tmp); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { printf("[003] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); } diff --git a/ext/mysqli/tests/mysqli_errno.phpt b/ext/mysqli/tests/mysqli_errno.phpt index c57b03726..48acbb623 100644 --- a/ext/mysqli/tests/mysqli_errno.phpt +++ b/ext/mysqli/tests/mysqli_errno.phpt @@ -1,8 +1,8 @@ --TEST-- mysqli_errno() --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> @@ -19,7 +19,7 @@ require_once('skipifconnectfailure.inc'); if (!is_null($tmp = @mysqli_errno($link))) printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { printf("[003] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); } diff --git a/ext/mysqli/tests/mysqli_errno_oo.phpt b/ext/mysqli/tests/mysqli_errno_oo.phpt index 09f7d6ed3..032f70a87 100644 --- a/ext/mysqli/tests/mysqli_errno_oo.phpt +++ b/ext/mysqli/tests/mysqli_errno_oo.phpt @@ -1,8 +1,8 @@ --TEST-- $mysqli->errno --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> diff --git a/ext/mysqli/tests/mysqli_error.phpt b/ext/mysqli/tests/mysqli_error.phpt index 8a2a749a6..517388045 100644 --- a/ext/mysqli/tests/mysqli_error.phpt +++ b/ext/mysqli/tests/mysqli_error.phpt @@ -1,8 +1,8 @@ --TEST-- mysqli_error() --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> @@ -19,7 +19,7 @@ require_once('skipifconnectfailure.inc'); if (!is_null($tmp = @mysqli_error($link))) printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { printf("[003] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); } diff --git a/ext/mysqli/tests/mysqli_error_unicode.phpt b/ext/mysqli/tests/mysqli_error_unicode.phpt index 09ab5a999..8789f89e8 100644 --- a/ext/mysqli/tests/mysqli_error_unicode.phpt +++ b/ext/mysqli/tests/mysqli_error_unicode.phpt @@ -24,7 +24,7 @@ require_once('skipifconnectfailure.inc'); $host, $user, $db, $port, $socket); } - if (!ini_get("unicode.semantics")) { + if (!(version_compare(PHP_VERSION, '5.9.9', '>') == 1)) { mysqli_query($link, "set names utf8"); } diff --git a/ext/mysqli/tests/mysqli_explain_metadata.phpt b/ext/mysqli/tests/mysqli_explain_metadata.phpt index a8cc59d7c..5bfb001a1 100644 --- a/ext/mysqli/tests/mysqli_explain_metadata.phpt +++ b/ext/mysqli/tests/mysqli_explain_metadata.phpt @@ -151,5 +151,9 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! diff --git a/ext/mysqli/tests/mysqli_fetch_all.phpt b/ext/mysqli/tests/mysqli_fetch_all.phpt index 0a8a7dec2..26401e7cc 100644 --- a/ext/mysqli/tests/mysqli_fetch_all.phpt +++ b/ext/mysqli/tests/mysqli_fetch_all.phpt @@ -297,6 +297,10 @@ if (!function_exists('mysqli_fetch_all')) print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- [005] array(2) { diff --git a/ext/mysqli/tests/mysqli_fetch_all_oo.phpt b/ext/mysqli/tests/mysqli_fetch_all_oo.phpt index e891f08d5..297d92ac7 100644 --- a/ext/mysqli/tests/mysqli_fetch_all_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_all_oo.phpt @@ -18,7 +18,7 @@ if (!function_exists('mysqli_fetch_all')) $mysqli = new mysqli(); - if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket)) + if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) printf("[002] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -300,6 +300,10 @@ if (!function_exists('mysqli_fetch_all')) print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- [005] array(2) { diff --git a/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt b/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt index 99d573200..d85eb9e6f 100644 --- a/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt @@ -28,6 +28,10 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- [002] array(2) { diff --git a/ext/mysqli/tests/mysqli_fetch_array_large.phpt b/ext/mysqli/tests/mysqli_fetch_array_large.phpt new file mode 100644 index 000000000..aa8c76871 --- /dev/null +++ b/ext/mysqli/tests/mysqli_fetch_array_large.phpt @@ -0,0 +1,150 @@ +--TEST-- +mysqli_fetch_array() - large packages (to test compression) +--SKIPIF-- +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +?> +--FILE-- +<?php + include "connect.inc"; + + function mysqli_fetch_array_large($offset, $link, $package_size) { + + /* we are aiming for maximum compression to test MYSQLI_CLIENT_COMPRESS */ + $random_char = str_repeat('a', 255); + $sql = "INSERT INTO test(label) VALUES "; + + while (strlen($sql) < ($package_size - 259)) + $sql .= sprintf("('%s'), ", $random_char); + + $sql = substr($sql, 0, -2); + assert(strlen($sql) < $package_size); + + if (!@mysqli_query($link, $sql)) { + if (1153 == mysqli_errno($link) || stristr(mysqli_error($link), 'max_allowed_packet')) + /* [1153] Got a packet bigger than 'max_allowed_packet' bytes */ + return false; + + printf("[%03d + 1] [%d] %s\n", $offset, mysqli_errno($link), mysqli_error($link)); + return false; + } + + /* buffered result set - let's hope we do not run into PHP memory limit... */ + if (!$res = mysqli_query($link, "SELECT id, label FROM test")) { + printf("[%03d + 2] [%d] %s\n", $offset, mysqli_errno($link), mysqli_error($link)); + return false; + } + + while ($row = mysqli_fetch_assoc($res)) { + if ($row['label'] != $random_char) { + printf("[%03d + 3] Wrong results - expecting '%s' got '%s', [%d] %s\n", + $offset, $random_char, $row['label'], mysqli_errno($link), mysqli_error($link)); + return false; + } + } + mysqli_free_result($res); + + if (!$stmt = mysqli_prepare($link, "SELECT id, label FROM test")) { + printf("[%03d + 4] [%d] %s\n", $offset, mysqli_errno($link), mysqli_error($link)); + return false; + } + + /* unbuffered result set */ + if (!mysqli_stmt_execute($stmt)) { + printf("[%03d + 5] [%d] %s\n", $offset, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt)); + return false; + } + + $id = $label = NULL; + if (!mysqli_stmt_bind_result($stmt, $id, $label)) { + printf("[%03d + 6] [%d] %s\n", $offset, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt)); + return false; + } + + while (mysqli_stmt_fetch($stmt)) { + if ($label != $random_char) { + printf("[%03d + 7] Wrong results - expecting '%s' got '%s', [%d] %s\n", + $offset, $random_char, $label, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt)); + return false; + } + } + + mysqli_stmt_free_result($stmt); + mysqli_stmt_close($stmt); + + return true; + } + + function parse_memory_limit($limit) { + + $val = trim($limit); + $last = strtolower($val[strlen($val)-1]); + + switch($last) { + // The 'G' modifier is available since PHP 5.1.0 + case 'g': + $val *= 1024; + case 'm': + $val *= 1024; + case 'k': + $val *= 1024; + default: + break; + } + return $val; + } + + + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", + $host, $user, $db, $port, $socket); + } + + if (!mysqli_query($link, "DROP TABLE IF EXISTS test") || + !mysqli_query($link, sprintf("CREATE TABLE test(id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, label VARCHAR(255)) ENGINE = %s", $engine))) + printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + + $package_size = 524288; + $offset = 3; + $limit = (ini_get('memory_limit') > 0) ? parse_memory_limit(ini_get('memory_limit')) : pow(2, 32); + + /* try to respect php.ini but make run time a soft limit */ + $max_runtime = (ini_get('max_execution_time') > 0) ? ini_get('max_execution_time') : 30; + set_time_limit(0); + + do { + if ($package_size > $limit) { + printf("stop: memory limit - %s vs. %s\n", $package_size, $limit); + break; + } + + $start = microtime(true); + if (!mysqli_fetch_array_large($offset++, $link, $package_size)) { + printf("stop: packet size - %d\n", $package_size); + break; + } + + $duration = microtime(true) - $start; + $max_runtime -= $duration; + if ($max_runtime < ($duration * 3)) { + /* likely the next iteration will not be within max_execution_time */ + printf("stop: time limit - %2.2fs\n", $max_runtime); + break; + } + + $package_size += $package_size; + + } while (true); + + + mysqli_close($link); + print "done!"; +?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> +--EXPECTF-- +stop: %s +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt b/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt index 6c8e58a88..c9ed7ccac 100644 --- a/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt @@ -108,5 +108,9 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_fetch_array_oo.phpt b/ext/mysqli/tests/mysqli_fetch_array_oo.phpt index e7e7d12d8..fcabb5903 100644 --- a/ext/mysqli/tests/mysqli_fetch_array_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array_oo.phpt @@ -14,7 +14,7 @@ require_once('skipifconnectfailure.inc'); $link = NULL; require('table.inc'); - if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket)) + if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -273,6 +273,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- [005] array(4) { diff --git a/ext/mysqli/tests/mysqli_fetch_assoc.phpt b/ext/mysqli/tests/mysqli_fetch_assoc.phpt index 6ea05caf6..6aaed3eb1 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc.phpt @@ -67,6 +67,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- [005] array(2) { diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt index dc01154da..d9bdcfad3 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt @@ -34,7 +34,7 @@ mysqli_fetch_assoc() - BIT return $bin; } - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -109,5 +109,9 @@ mysqli_fetch_assoc() - BIT mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt index 3ba0218a3..e9a746ec0 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt @@ -20,7 +20,7 @@ require_once('skipifconnectfailure.inc'); printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); require('table.inc'); - if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket)) + if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) printf("[002] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -54,6 +54,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- [005] array(2) { diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt index 35bbfb7ba..ce7e82dc0 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt @@ -70,5 +70,9 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_fetch_field.phpt b/ext/mysqli/tests/mysqli_fetch_field.phpt index 57952967f..dba9f2f55 100644 --- a/ext/mysqli/tests/mysqli_fetch_field.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field.phpt @@ -56,6 +56,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- object(stdClass)#%d (11) { [%u|b%"name"]=> diff --git a/ext/mysqli/tests/mysqli_fetch_field_direct.phpt b/ext/mysqli/tests/mysqli_fetch_field_direct.phpt index 2eb7cd28d..5b4dc5671 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_direct.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_direct.phpt @@ -40,6 +40,10 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_fetch_field_direct(): Field offset is invalid for resultset in %s on line %d bool(false) diff --git a/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt b/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt index a8ad58e00..f1075139e 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt @@ -20,7 +20,7 @@ require_once('skipifconnectfailure.inc'); require('table.inc'); - if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket)) + if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) printf("[002] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -49,6 +49,10 @@ require_once('skipifconnectfailure.inc'); $mysqli->close(); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_result::fetch_field_direct(): Field offset is invalid for resultset in %s on line %d bool(false) diff --git a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt index 9c74408c2..6f1cea20c 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt @@ -7,7 +7,7 @@ require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); -if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die(printf("skip: [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error())); if (mysqli_get_server_version($link) < 50041) @@ -101,7 +101,7 @@ mysqli_close($link); return array($expected_flags, $unexpected_flags, $found_flags); } - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); foreach ($columns as $column_def => $expected_flags) { @@ -229,5 +229,9 @@ mysqli_close($link); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_fetch_field_oo.phpt b/ext/mysqli/tests/mysqli_fetch_field_oo.phpt index d7e255b83..2c169ed3f 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_oo.phpt @@ -44,6 +44,10 @@ require_once('skipifconnectfailure.inc'); $mysqli->close(); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- object(stdClass)#%d (11) { [%u|b%"name"]=> diff --git a/ext/mysqli/tests/mysqli_fetch_field_types.phpt b/ext/mysqli/tests/mysqli_fetch_field_types.phpt index fa9825354..ae18f0ca6 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_types.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_types.phpt @@ -115,5 +115,9 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_fetch_fields.phpt b/ext/mysqli/tests/mysqli_fetch_fields.phpt index de21d2cd6..0acec5477 100644 --- a/ext/mysqli/tests/mysqli_fetch_fields.phpt +++ b/ext/mysqli/tests/mysqli_fetch_fields.phpt @@ -37,6 +37,10 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- object(stdClass)#%d (11) { [%u|b%"name"]=> diff --git a/ext/mysqli/tests/mysqli_fetch_lengths.phpt b/ext/mysqli/tests/mysqli_fetch_lengths.phpt index 054bfcb29..71c234922 100644 --- a/ext/mysqli/tests/mysqli_fetch_lengths.phpt +++ b/ext/mysqli/tests/mysqli_fetch_lengths.phpt @@ -36,6 +36,10 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- bool(false) array(2) { diff --git a/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt b/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt index 3689c69fc..ef7d7622f 100644 --- a/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); <?php include "connect.inc"; - if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket)) + if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect\n"); require('table.inc'); @@ -28,6 +28,13 @@ require_once('skipifconnectfailure.inc'); $mysqli->close(); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- NULL array(2) { diff --git a/ext/mysqli/tests/mysqli_fetch_object.phpt b/ext/mysqli/tests/mysqli_fetch_object.phpt index 39cfd0518..f164c4e19 100644 --- a/ext/mysqli/tests/mysqli_fetch_object.phpt +++ b/ext/mysqli/tests/mysqli_fetch_object.phpt @@ -131,6 +131,10 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: Missing argument 1 for mysqli_fetch_object_construct::__construct() in %s on line %d diff --git a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt index 9fc795a10..fc7efe4b2 100644 --- a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt +++ b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt @@ -44,6 +44,10 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- No exception with PHP: object(mysqli_fetch_object_test)#%d (%d) { diff --git a/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt b/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt index a9173d093..c76742226 100644 --- a/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt +++ b/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt @@ -19,6 +19,10 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- %s(6) "object" done! diff --git a/ext/mysqli/tests/mysqli_fetch_object_oo.phpt b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt index fe3434cf6..10b39e2ec 100644 --- a/ext/mysqli/tests/mysqli_fetch_object_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt @@ -19,7 +19,7 @@ require_once('skipifconnectfailure.inc'); printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); require('table.inc'); - if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket)) + if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) printf("[002] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -105,6 +105,10 @@ require_once('skipifconnectfailure.inc'); $mysqli->close(); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: Missing argument 1 for mysqli_fetch_object_construct::__construct() in %s on line %d diff --git a/ext/mysqli/tests/mysqli_fetch_row.phpt b/ext/mysqli/tests/mysqli_fetch_row.phpt index 6723fdb65..bb44fd418 100644 --- a/ext/mysqli/tests/mysqli_fetch_row.phpt +++ b/ext/mysqli/tests/mysqli_fetch_row.phpt @@ -37,6 +37,10 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- [004] array(3) { diff --git a/ext/mysqli/tests/mysqli_field_count.phpt b/ext/mysqli/tests/mysqli_field_count.phpt index be8c3075d..5c63b86f6 100644 --- a/ext/mysqli/tests/mysqli_field_count.phpt +++ b/ext/mysqli/tests/mysqli_field_count.phpt @@ -47,6 +47,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- int(0) int(2) diff --git a/ext/mysqli/tests/mysqli_field_seek.phpt b/ext/mysqli/tests/mysqli_field_seek.phpt index 207471974..9d17f1a75 100644 --- a/ext/mysqli/tests/mysqli_field_seek.phpt +++ b/ext/mysqli/tests/mysqli_field_seek.phpt @@ -101,6 +101,10 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_field_seek(): Invalid field offset in %s on line %d bool(false) diff --git a/ext/mysqli/tests/mysqli_field_tell.phpt b/ext/mysqli/tests/mysqli_field_tell.phpt index 81626346a..9609a7c5d 100644 --- a/ext/mysqli/tests/mysqli_field_tell.phpt +++ b/ext/mysqli/tests/mysqli_field_tell.phpt @@ -54,6 +54,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- int(0) diff --git a/ext/mysqli/tests/mysqli_fork.phpt b/ext/mysqli/tests/mysqli_fork.phpt index d5d8ad11f..7e5aac928 100644 --- a/ext/mysqli/tests/mysqli_fork.phpt +++ b/ext/mysqli/tests/mysqli_fork.phpt @@ -13,7 +13,7 @@ if (!function_exists('posix_getpid')) die("skip POSIX functions not available"); require_once('connect.inc'); -if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { die(sprintf("skip Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket)); } @@ -68,7 +68,7 @@ if ($row[1] == "DISABLED" || $row[1] == "NO") { gettype($errno), $errno, gettype($error), $error); mysqli_close($link); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[005] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -97,7 +97,7 @@ if ($row[1] == "DISABLED" || $row[1] == "NO") { case 0: /* child */ - if (!($plink = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) || !mysqli_autocommit($plink, true)) + if (!($plink = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) || !mysqli_autocommit($plink, true)) exit(mysqli_errno($plink)); $sql = sprintf("INSERT INTO messages(pid, sender, msg) VALUES (%d, 'child', '%%s')", posix_getpid()); @@ -141,7 +141,7 @@ if ($row[1] == "DISABLED" || $row[1] == "NO") { default: /* parent */ - if (!$plink = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$plink = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[010] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -221,7 +221,7 @@ if ($row[1] == "DISABLED" || $row[1] == "NO") { mysqli_free_result($res); mysqli_close($link); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[018] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -234,6 +234,20 @@ if ($row[1] == "DISABLED" || $row[1] == "NO") { print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS messages")) + printf("[c003] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- array(1) { ["message"]=> diff --git a/ext/mysqli/tests/mysqli_free_result.phpt b/ext/mysqli/tests/mysqli_free_result.phpt index 32f57078d..145435358 100644 --- a/ext/mysqli/tests/mysqli_free_result.phpt +++ b/ext/mysqli/tests/mysqli_free_result.phpt @@ -51,6 +51,10 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- a NULL diff --git a/ext/mysqli/tests/mysqli_get_cache_stats.phpt b/ext/mysqli/tests/mysqli_get_cache_stats.phpt index c9dcc0959..d49e399bb 100644 --- a/ext/mysqli/tests/mysqli_get_cache_stats.phpt +++ b/ext/mysqli/tests/mysqli_get_cache_stats.phpt @@ -1,5 +1,10 @@ --TEST-- mysqli_get_cache_stats() +--XFAIL-- +zval caching has been temporarily disabled for the 5.3.0 release +--INI-- +mysqlnd.collect_statistics="1" +mysqlnd.collect_memory_statistics="1" --SKIPIF-- <?PHP require_once('skipif.inc'); @@ -22,9 +27,9 @@ if (!function_exists('mysqli_get_cache_stats')) { var_dump($info); - if ($info['size'] !== $info['free_items']) + if ($info["size"] !== $info['free_items']) printf("[003] Unused cache should have size (%d) == free_items (%d)\n", - $info['size'], $info['free_items']); + $info["size"], $info['free_items']); require_once('table.inc'); @@ -87,6 +92,10 @@ if (!function_exists('mysqli_get_cache_stats')) { print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- array(7) { [%u|b%"put_hits"]=> diff --git a/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt b/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt index 969a21be9..0bb90fa71 100644 --- a/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt +++ b/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt @@ -1,5 +1,10 @@ --TEST-- mysqli_get_cache_stats() - freeing for buffered result sets +--XFAIL-- +zval caching has been temporarily disabled for the 5.3.0 release +--INI-- +mysqlnd.collect_statistics="1" +mysqlnd.collect_memory_statistics="1" --SKIPIF-- <?PHP require_once('skipif.inc'); @@ -86,5 +91,9 @@ if (!function_exists('mysqli_get_cache_stats')) { print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_cache_stats_off.phpt b/ext/mysqli/tests/mysqli_get_cache_stats_off.phpt new file mode 100644 index 000000000..4b0bab240 --- /dev/null +++ b/ext/mysqli/tests/mysqli_get_cache_stats_off.phpt @@ -0,0 +1,64 @@ +--TEST-- +mysqli_get_cache_stats() - disabled via php.ini +--INI-- +mysqlnd.collect_statistics="0" +mysqlnd.collect_memory_statistics="0" +--SKIPIF-- +<?PHP +require_once('skipif.inc'); +require_once('skipifemb.inc'); +require_once('skipifconnectfailure.inc'); +if (!function_exists('mysqli_get_cache_stats')) { + die("skip only available with mysqlnd"); +} +?> +--FILE-- +<?php + $before = mysqli_get_cache_stats(); + if (!is_array($before) || empty($before)) { + printf("[001] Expecting non-empty array, got %s.\n", gettype($before)); + var_dump($before); + } + + require_once('table.inc'); + if (!$res = mysqli_query($link, "SELECT id, label FROM test")) { + printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + } + while ($row = mysqli_fetch_assoc($res)) + ; + if (!$res = mysqli_query($link, "SELECT id, label FROM test")) { + printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + } + while ($row = mysqli_fetch_assoc($res)) + ; + + $after = mysqli_get_cache_stats(); + /* references has to be maintained - it is used for memory management */ + $ignore = array('references' => true); + foreach ($before as $k => $v) { + if (isset($ignore[$k])) + continue; + + if ($before[$k] != $after[$k]) + printf("[004] Statistics have changed - %s: %s => %s\n", $ + $k, $before[$k], $after[$k]); + } + + $ignore = array("size" => true, "free_items" => true, "references" => true); + foreach ($after as $k => $v) { + if ($v != 0 && !isset($ignore[$k])) { + printf("[005] Field %s should not have any other value but 0, got %s.\n", + $k, $v); + } + } + + mysqli_close($link); + + print "done!"; +?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> +--EXPECTF-- +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_charset.phpt b/ext/mysqli/tests/mysqli_get_charset.phpt index 128e07f82..314853dc0 100644 --- a/ext/mysqli/tests/mysqli_get_charset.phpt +++ b/ext/mysqli/tests/mysqli_get_charset.phpt @@ -106,6 +106,10 @@ if (!function_exists('mysqli_get_charset')) print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_get_charset(): Couldn't fetch mysqli in %s on line %d done! diff --git a/ext/mysqli/tests/mysqli_get_client_stats.phpt b/ext/mysqli/tests/mysqli_get_client_stats.phpt index dd1ccfdea..ed75f7bc5 100644 --- a/ext/mysqli/tests/mysqli_get_client_stats.phpt +++ b/ext/mysqli/tests/mysqli_get_client_stats.phpt @@ -91,7 +91,7 @@ mysqlnd.collect_memory_statistics=1 var_dump($info); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { printf("[003] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); exit(1); @@ -118,7 +118,7 @@ mysqlnd.collect_memory_statistics=1 mysqli_get_client_stats_assert_eq('result_set_queries', $new_info, $info, $test_counter); /* we need to skip this test in unicode - we send set names utf8 during mysql_connect */ - if (!ini_get("unicode.semantics")) + if (!(version_compare(PHP_VERSION, '5.9.9', '>') == 1)) mysqli_get_client_stats_assert_eq('non_result_set_queries', $new_info, $info, $test_counter); mysqli_get_client_stats_assert_eq('buffered_sets', $new_info, $info, $test_counter); mysqli_get_client_stats_assert_eq('unbuffered_sets', $new_info, $info, $test_counter); @@ -840,6 +840,8 @@ mysqlnd.collect_memory_statistics=1 mysqli_get_client_stats_assert_eq('buffered_sets', $new_info, (string)($info['buffered_sets'] + 1), $test_counter, 'mysqli_use_result()'); $info = $new_info; + mysqli_close($link); + /* no_index_used @@ -858,8 +860,34 @@ mysqlnd.collect_memory_statistics=1 print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS non_result_set_queries_test")) + printf("[c003] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS client_stats_test")) + printf("[c004] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +if (!mysqli_query($link, "DROP DATABASE IF EXISTS mysqli_get_client_stats_")) + printf("[c005] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +if (!mysqli_query($link, "DROP DATABASE IF EXISTS mysqli_get_client_stats")) + printf("[c006] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +if (!mysqli_query($link, "DROP SERVER IF EXISTS myself")) + printf("[c007] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- -array(119) { +array(121) { [%u|b%"bytes_sent"]=> %unicode|string%(1) "0" [%u|b%"bytes_received"]=> @@ -1005,9 +1033,9 @@ array(119) { [%u|b%"mem_malloc_ammount"]=> %unicode|string%(1) "0" [%u|b%"mem_calloc_count"]=> - %unicode|string%(1) "0" + %unicode|string%(%d) "%d" [%u|b%"mem_calloc_ammount"]=> - %unicode|string%(1) "0" + %unicode|string%(%d) "%d" [%u|b%"mem_realloc_count"]=> %unicode|string%(1) "0" [%u|b%"mem_realloc_ammount"]=> @@ -1098,6 +1126,10 @@ array(119) { %unicode|string%(1) "0" [%u|b%"proto_binary_fetched_other"]=> %unicode|string%(1) "0" + [%u|b%"init_command_executed_count"]=> + %unicode|string%(1) "0" + [%u|b%"init_command_failed_count"]=> + %unicode|string%(1) "0" } Testing buffered normal... Testing buffered normal... - SELECT id, label FROM test diff --git a/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt b/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt index 6d835abd8..880ee321f 100644 --- a/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt +++ b/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt @@ -36,6 +36,10 @@ mysqlnd.collect_memory_statistics=1 print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- BEGINNING: implicit_free_result = %d END: implicit_free_result = %d diff --git a/ext/mysqli/tests/mysqli_get_client_stats_off.phpt b/ext/mysqli/tests/mysqli_get_client_stats_off.phpt index 8a731ca74..e2dff9bef 100644 --- a/ext/mysqli/tests/mysqli_get_client_stats_off.phpt +++ b/ext/mysqli/tests/mysqli_get_client_stats_off.phpt @@ -15,24 +15,34 @@ mysqlnd.collect_memory_statistics=0 --FILE-- <?php $before = mysqli_get_client_stats(); + if (!is_array($before) || empty($before)) { + printf("[001] Expecting non-empty array, got %s.\n", gettype($before)); + var_dump($before); + } + // connect and table inc connect to mysql and create tables require_once('connect.inc'); require_once('table.inc'); $after = mysqli_get_client_stats(); - if (!is_array($before) || empty($before)) { - printf("[001] Expecting non-empty array, got %s.\n", gettype($before)); + if ($before !== $after) { + printf("[002] Statistics have changed\n"); var_dump($before); + var_dump($after); } foreach ($after as $k => $v) if ($v != 0) { - printf("[002] Field %s should not have any other value but 0, got %s.\n", + printf("[003] Field %s should not have any other value but 0, got %s.\n", $k, $v); } mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt b/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt index fea641b81..d12957b11 100644 --- a/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt +++ b/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt @@ -89,6 +89,10 @@ mysqlnd.collect_memory_statistics=1 mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- BEGINNING: rows_fetched_from_client_ps_unbuffered = %d BEGINNING: rows_fetched_from_client_ps_buffered = %d diff --git a/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt b/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt index 9dd802db0..0358656ab 100644 --- a/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt +++ b/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt @@ -1,5 +1,8 @@ --TEST-- mysqli_get_client_stats() - skipped rows +--INI-- +mysqlnd.collect_statistics="1" +mysqlnd.collect_memory_statistics="1" --SKIPIF-- <?PHP require_once('skipif.inc'); diff --git a/ext/mysqli/tests/mysqli_get_connection_stats.phpt b/ext/mysqli/tests/mysqli_get_connection_stats.phpt index ba71cd649..698a4684f 100644 --- a/ext/mysqli/tests/mysqli_get_connection_stats.phpt +++ b/ext/mysqli/tests/mysqli_get_connection_stats.phpt @@ -1,5 +1,8 @@ --TEST-- mysqli_get_connection_stats() +--INI-- +mysqlnd.collect_statistics="1" +mysqlnd.collect_memory_statistics="1" --SKIPIF-- <?PHP require_once('skipif.inc'); @@ -39,7 +42,22 @@ if (!function_exists('mysqli_get_connection_stats')) { } if ($info !== $info2) { - printf("[005] The hashes should be identical\n"); + printf("[005] The hashes should be identical except of the memory related fields\n"); + var_dump($info); + var_dump($info2); + } + + if (!is_array($info = $link->get_connection_stats()) || empty($info)) + printf("[006] Expecting array/any_non_empty, got %s/%s\n", gettype($info), $info); + + foreach ($info as $k => &$v) { + if (strpos($k, "mem_") === 0) { + $v = 0; + } + } + + if ($info !== $info2) { + printf("[007] The hashes should be identical except of the memory related fields\n"); var_dump($info); var_dump($info2); } @@ -48,19 +66,23 @@ if (!function_exists('mysqli_get_connection_stats')) { include "table.inc"; if (!is_array($info = mysqli_get_connection_stats($link)) || empty($info)) - printf("[006] Expecting array/any_non_empty, got %s/%s\n", gettype($info), $info); + printf("[008] Expecting array/any_non_empty, got %s/%s\n", gettype($info), $info); if (!is_array($info2 = mysqli_get_client_stats()) || empty($info2)) - printf("[007] Expecting array/any_non_empty, got %s/%s\n", gettype($info2), $info2); + printf("[009] Expecting array/any_non_empty, got %s/%s\n", gettype($info2), $info2); // assuming the test is run in a plain-vanilla CLI environment if ($info === $info2) { - printf("[008] The hashes should not be identical\n"); + printf("[010] The hashes should not be identical\n"); var_dump($info); var_dump($info2); } print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! diff --git a/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt b/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt new file mode 100644 index 000000000..4897063c1 --- /dev/null +++ b/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt @@ -0,0 +1,53 @@ +--TEST-- +mysqli_get_connection_stats() - disable via php.ini +--INI-- +mysqlnd.collect_statistics="0" +mysqlnd.collect_memory_statistics="0" +--SKIPIF-- +<?PHP +require_once('skipif.inc'); +require_once('skipifemb.inc'); +require_once('skipifconnectfailure.inc'); +if (!function_exists('mysqli_get_connection_stats')) { + die("skip only available with mysqlnd"); +} +?> +--FILE-- +<?php + // connect and table inc connect to mysql and create tables + require_once('connect.inc'); + + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", + $host, $user, $db, $port, $socket); + } + $before = mysqli_get_connection_stats($link); + if (!is_array($before) || empty($before)) { + printf("[002] Expecting non-empty array, got %s.\n", gettype($before)); + var_dump($before); + } + + mysqli_close($link); + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + printf("[003] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", + $host, $user, $db, $port, $socket); + } + $after = mysqli_get_connection_stats($link); + + if ($before !== $after) { + printf("[004] Statistics differ!"); + var_dump($before); + var_dump($after); + } + + foreach ($after as $k => $v) + if ($v != 0) { + printf("[004] Field %s should not have any other value but 0, got %s.\n", + $k, $v); + } + + mysqli_close($link); + print "done!"; +?> +--EXPECTF-- +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 f76cc7002..63fdad28b 100644 --- a/ext/mysqli/tests/mysqli_get_host_info.phpt +++ b/ext/mysqli/tests/mysqli_get_host_info.phpt @@ -1,9 +1,9 @@ --TEST-- mysqli_get_host_info() --SKIPIF-- -<?php -require_once('skipif.inc'); -require_once('skipifemb.inc'); +<?php +require_once('skipif.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -22,5 +22,9 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- 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 69dfe8763..f10cc4cfa 100644 --- a/ext/mysqli/tests/mysqli_get_server_info.phpt +++ b/ext/mysqli/tests/mysqli_get_server_info.phpt @@ -1,9 +1,9 @@ --TEST-- mysqli_get_server_info() --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -25,5 +25,9 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- 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 2583bf94b..1472f297f 100644 --- a/ext/mysqli/tests/mysqli_get_warnings.phpt +++ b/ext/mysqli/tests/mysqli_get_warnings.phpt @@ -25,7 +25,7 @@ if (!$TEST_EXPERIMENTAL) if (!is_null($tmp = @mysqli_get_warnings(''))) printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { printf("[003] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); } @@ -84,7 +84,7 @@ if (!$TEST_EXPERIMENTAL) mysqli_close($link); - if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket)) + if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) printf("[021] Cannot create mysqli object: [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); if (!$mysqli->query("DROP TABLE IF EXISTS t1")) @@ -103,7 +103,7 @@ if (!$TEST_EXPERIMENTAL) printf("[026] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); /* Yes, I really want to check if the object property is empty */ - if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket)) + if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) printf("[027] Cannot create mysqli object: [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); $warning = new mysqli_warning($mysqli); @@ -113,7 +113,7 @@ if (!$TEST_EXPERIMENTAL) if ('' != ($tmp = $warning->message)) printf("[029] Expecting string/empty, got %s/%s\n", gettype($tmp), $tmp); - if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket)) + if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) printf("[030] Cannot create mysqli object: [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); if (!$mysqli->query("DROP TABLE IF EXISTS t1")) @@ -129,7 +129,7 @@ if (!$TEST_EXPERIMENTAL) $warning = new mysqli_warning($mysqli); $i = 1; while ($warning->next() && ('' != ($tmp = $warning->message))) { - if (ini_get('unicode.semantics') && !is_unicode($tmp)) + if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && !is_unicode($tmp)) printf("[033a] Warning should have been a unicode string, got %s/%s", gettype($tmp), $tmp); $i++; } @@ -143,5 +143,18 @@ if (!$TEST_EXPERIMENTAL) print "done!"; ?> +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS t1")) + printf("[c003] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_info.phpt b/ext/mysqli/tests/mysqli_info.phpt index 8760f2177..caa7c9010 100644 --- a/ext/mysqli/tests/mysqli_info.phpt +++ b/ext/mysqli/tests/mysqli_info.phpt @@ -85,7 +85,7 @@ require_once('skipifconnectfailure.inc'); } if (!is_string($tmp = mysqli_info($link)) || ('' == $tmp)) - printf("[015] Expecting string/any_non_empty, got %s/%s\n", gettype($tmp), $tmp); + printf("[016] Expecting string/any_non_empty, got %s/%s\n", gettype($tmp), $tmp); unlink($file); } while (false); @@ -93,5 +93,9 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_insert_id.phpt b/ext/mysqli/tests/mysqli_insert_id.phpt index 398432672..a5491bf97 100644 --- a/ext/mysqli/tests/mysqli_insert_id.phpt +++ b/ext/mysqli/tests/mysqli_insert_id.phpt @@ -130,6 +130,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_insert_id(): Couldn't fetch mysqli in %s on line %d NULL diff --git a/ext/mysqli/tests/mysqli_insert_id_variation.phpt b/ext/mysqli/tests/mysqli_insert_id_variation.phpt index 94f996475..1717b309c 100644 --- a/ext/mysqli/tests/mysqli_insert_id_variation.phpt +++ b/ext/mysqli/tests/mysqli_insert_id_variation.phpt @@ -9,7 +9,7 @@ require_once('skipifconnectfailure.inc'); <?php include "connect.inc"; -if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -87,6 +87,17 @@ if ($i != $link->insert_id || $i != mysqli_insert_id($link)) { $link->query("DROP TABLE IF EXISTS test_insert_id_var"); echo "DONE"; ---EXPECTF-- -DONE +?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_insert_id_var")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> +--EXPECTF-- +DONE
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_kill.phpt b/ext/mysqli/tests/mysqli_kill.phpt index 0d79f8f88..64daad88e 100644 --- a/ext/mysqli/tests/mysqli_kill.phpt +++ b/ext/mysqli/tests/mysqli_kill.phpt @@ -52,7 +52,7 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[009] Cannot connect, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); mysqli_kill($link, -1); @@ -64,7 +64,7 @@ require_once('skipifconnectfailure.inc'); mysqli_free_result($res); mysqli_close($link); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[011] Cannot connect, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); mysqli_change_user($link, "This might work if you accept anonymous users in your setup", "password", $db); mysqli_kill($link, -1); @@ -73,6 +73,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_kill(): processid should have positive value in %s on line %d %unicode|string%(%d) "%s" diff --git a/ext/mysqli/tests/mysqli_max_links.phpt b/ext/mysqli/tests/mysqli_max_links.phpt index a9a798022..7f4941940 100644 --- a/ext/mysqli/tests/mysqli_max_links.phpt +++ b/ext/mysqli/tests/mysqli_max_links.phpt @@ -20,7 +20,7 @@ mysqli.max_links=1 $links = array(); for ($i = 1; $i <= 5; $i++) - if ($links[$i] = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if ($links[$i] = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[%03d] One link is already open, it should not be possible to open more, [%d] %s, [%d] %s\n", $i, mysqli_connect_errno(), mysqli_connect_error(), mysqli_errno($links[$i]), mysqli_error($links[$i])); @@ -36,19 +36,23 @@ mysqli.max_links=1 mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- bool(true) int(1) -Warning: mysqli_connect(): Too many open links (1) in %s on line %d +Warning: mysqli_%sonnect(): Too many open links (1) in %s on line %d -Warning: mysqli_connect(): Too many open links (1) in %s on line %d +Warning: mysqli_%sonnect(): Too many open links (1) in %s on line %d -Warning: mysqli_connect(): Too many open links (1) in %s on line %d +Warning: mysqli_%sonnect(): Too many open links (1) in %s on line %d -Warning: mysqli_connect(): Too many open links (1) in %s on line %d +Warning: mysqli_%sonnect(): Too many open links (1) in %s on line %d -Warning: mysqli_connect(): Too many open links (1) in %s on line %d +Warning: mysqli_%sonnect(): Too many open links (1) in %s on line %d Warning: mysqli_query() expects parameter 1 to be mysqli, boolean given in %s on line %d diff --git a/ext/mysqli/tests/mysqli_more_results.phpt b/ext/mysqli/tests/mysqli_more_results.phpt index 1f1216884..49de0d7fa 100644 --- a/ext/mysqli/tests/mysqli_more_results.phpt +++ b/ext/mysqli/tests/mysqli_more_results.phpt @@ -1,9 +1,9 @@ --TEST-- mysqli_more_results() --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -95,6 +95,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- [004] bool(false) diff --git a/ext/mysqli/tests/mysqli_multi_query.phpt b/ext/mysqli/tests/mysqli_multi_query.phpt index f28479bb4..dd26fd71b 100644 --- a/ext/mysqli/tests/mysqli_multi_query.phpt +++ b/ext/mysqli/tests/mysqli_multi_query.phpt @@ -1,9 +1,9 @@ --TEST-- mysqli_multi_query() --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -146,6 +146,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- [006] 3 [008] 0 diff --git a/ext/mysqli/tests/mysqli_mysqli_result_invalid_mode.phpt b/ext/mysqli/tests/mysqli_mysqli_result_invalid_mode.phpt index 5bd78a9c1..29ff65780 100644 --- a/ext/mysqli/tests/mysqli_mysqli_result_invalid_mode.phpt +++ b/ext/mysqli/tests/mysqli_mysqli_result_invalid_mode.phpt @@ -1,9 +1,9 @@ --TEST-- mysqli_result(), invalid mode --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -21,6 +21,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_result::__construct(): Invalid value for resultmode in %s on line %d done! diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt new file mode 100644 index 000000000..67a5ab6d5 --- /dev/null +++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt @@ -0,0 +1,36 @@ +--TEST-- +mysqlnd.net_read_timeout limit check +--SKIPIF-- +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +require_once('connect.inc'); +if (!$IS_MYSQLND) + /* The libmysql read_timeout limit default is 365 * 24 * 3600 seconds. It cannot be altered through PHP API calls */ + die("skip mysqlnd only test"); +?> +--INI-- +default_socket_timeout=60 +max_execution_time=60 +mysqlnd.net_read_timeout=1 +--FILE-- +<?php + include ("connect.inc"); + + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + printf("[001] Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + } + + if (!$res = mysqli_query($link, "SELECT SLEEP(5)")) + printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + + mysqli_close($link); + + print "done!"; +?> +--EXPECTF-- +Warning: mysqli_query(): MySQL server has gone away in %s on line %d + +Warning: mysqli_query(): Error reading result set's header in %s on line %d +[002] [%d] %s +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 new file mode 100644 index 000000000..637fd1629 --- /dev/null +++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt @@ -0,0 +1,37 @@ +--TEST-- +mysqlnd.net_read_timeout > default_socket_timeout +--SKIPIF-- +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +require_once('connect.inc'); +?> +--INI-- +default_socket_timeout=1 +mysqlnd.net_read_timeout=12 +max_execution_time=12 +--FILE-- +<?php + set_time_limit(12); + include ("connect.inc"); + + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + printf("[001] Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + } + + if (!$res = mysqli_query($link, "SELECT SLEEP(6)")) + printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + + var_dump($res->fetch_assoc()); + + mysqli_free_result($res); + mysqli_close($link); + + print "done!"; +?> +--EXPECTF-- +array(1) { + [%u|b%"SLEEP(6)"]=> + %unicode|string%(1) "0" +} +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt new file mode 100644 index 000000000..f5a13c5f6 --- /dev/null +++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt @@ -0,0 +1,36 @@ +--TEST-- +mysqlnd.net_read_timeout = 0 +--SKIPIF-- +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +require_once('connect.inc'); +?> +--INI-- +default_socket_timeout=10 +max_execution_time=10 +mysqlnd.net_read_timeout=0 +--FILE-- +<?php + include ("connect.inc"); + + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + printf("[001] Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + } + + if (!$res = mysqli_query($link, "SELECT SLEEP(2)")) + printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + + var_dump($res->fetch_assoc()); + + mysqli_free_result($res); + mysqli_close($link); + + print "done!"; +?> +--EXPECTF-- +array(1) { + [%u|b%"SLEEP(2)"]=> + %unicode|string%(1) "0" +} +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_next_result.phpt b/ext/mysqli/tests/mysqli_next_result.phpt index 118b8677c..0dc49c72f 100644 --- a/ext/mysqli/tests/mysqli_next_result.phpt +++ b/ext/mysqli/tests/mysqli_next_result.phpt @@ -1,9 +1,9 @@ --TEST-- mysqli_next_result() --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -114,6 +114,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_next_result(): Couldn't fetch mysqli in %s on line %d NULL diff --git a/ext/mysqli/tests/mysqli_no_reconnect.phpt b/ext/mysqli/tests/mysqli_no_reconnect.phpt index d392b5a1c..aa7b1c3b5 100644 --- a/ext/mysqli/tests/mysqli_no_reconnect.phpt +++ b/ext/mysqli/tests/mysqli_no_reconnect.phpt @@ -13,7 +13,7 @@ mysqli.reconnect=0 require_once("connect.inc"); require_once("table.inc"); - if (!$link2 = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link2 = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot create second database connection, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); @@ -73,7 +73,7 @@ mysqli.reconnect=0 printf("[011] Executing a query should not be possible, connection should be closed, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); - if (!$link = @mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[012] Cannot create database connection, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/mysqli_num_fields.phpt b/ext/mysqli/tests/mysqli_num_fields.phpt index fc99ecf9e..88825573c 100644 --- a/ext/mysqli/tests/mysqli_num_fields.phpt +++ b/ext/mysqli/tests/mysqli_num_fields.phpt @@ -1,9 +1,9 @@ --TEST-- mysqli_num_fields() --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -48,6 +48,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_num_fields(): Couldn't fetch mysqli_result in %s on line %d done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_num_rows.phpt b/ext/mysqli/tests/mysqli_num_rows.phpt index 70af3c404..f1798cc2c 100644 --- a/ext/mysqli/tests/mysqli_num_rows.phpt +++ b/ext/mysqli/tests/mysqli_num_rows.phpt @@ -1,9 +1,9 @@ --TEST-- mysqli_num_rows() --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -73,6 +73,10 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_num_rows() expects parameter 1 to be mysqli_result, boolean given in %s on line %d diff --git a/ext/mysqli/tests/mysqli_options.phpt b/ext/mysqli/tests/mysqli_options.phpt index 2a1e25c29..670f9aca7 100644 --- a/ext/mysqli/tests/mysqli_options.phpt +++ b/ext/mysqli/tests/mysqli_options.phpt @@ -43,7 +43,7 @@ already through other measures. $valid_options[] = constant('MYSQLI_OPT_INT_AND_FLOAT_NATIVE'); if (defined('MYSQLI_OPT_NUMERIC_AND_DATETIME_AS_UNICODE')) $valid_options[] = constant('MYSQLI_OPT_NUMERIC_AND_DATETIME_AS_UNICODE'); - + $tmp = NULL; $link = NULL; @@ -85,11 +85,14 @@ already through other measures. !($tmp = mysqli_options($link, constant('MYSQLI_OPT_NUMERIC_AND_DATETIME_AS_UNICODE'), true))) printf("[006] Expecting boolean/true got %s/%s\n", gettype($tmp), $tmp); - for ($flag = -10000; $flag < 10000; $flag++) { - if (in_array($flag, $valid_options)) - continue; - if (FALSE !== ($tmp = mysqli_options($link, $flag, 'definetely not an mysqli_option'))) { - var_dump("SOME_FLAG", $flag, $tmp); + if ($IS_MYSQLND) { + /* Don't do this with libmysql. You may hit options not exported to PHP and cause false positives */ + for ($flag = -10000; $flag < 10000; $flag++) { + if (in_array($flag, $valid_options)) + continue; + if (FALSE !== ($tmp = mysqli_options($link, $flag, 'definetely not an mysqli_option'))) { + var_dump(array("SOME_FLAG" => $flag, "ret" => $tmp)); + } } } @@ -97,7 +100,6 @@ already through other measures. echo "Link closed"; var_dump("MYSQLI_INIT_COMMAND", mysqli_options($link, MYSQLI_INIT_COMMAND, 'SET AUTOCOMMIT=1')); - var_dump("SOME_RANDOM_FLAG", mysqli_options($link, $flag, 'definetly not an mysqli_option')); print "done!"; ?> --EXPECTF-- @@ -127,8 +129,4 @@ Link closed Warning: mysqli_options(): Couldn't fetch mysqli in %s line %d %s(19) "MYSQLI_INIT_COMMAND" NULL - -Warning: mysqli_options(): Couldn't fetch mysqli in %s line %d -%s(16) "SOME_RANDOM_FLAG" -NULL done! diff --git a/ext/mysqli/tests/mysqli_options_init_command.phpt b/ext/mysqli/tests/mysqli_options_init_command.phpt index 667b58175..2ba2ce461 100644 --- a/ext/mysqli/tests/mysqli_options_init_command.phpt +++ b/ext/mysqli/tests/mysqli_options_init_command.phpt @@ -1,19 +1,78 @@ --TEST-- mysqli_options() --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); - -die("skip - STUB - TODO - this is a stub to remind me that we should also actually test the options"); ?> <?php require_once('skipifemb.inc'); ?> --FILE-- <?php /* see mysqli.c for details */ include "connect.inc"; + + if (!($link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))) + printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", + $host, $user, $db, $port, $socket); + + /* TODO: test more options */ + if (!mysqli_query($link, "DROP TABLE IF EXISTS test") || + !mysqli_query($link, sprintf("CREATE TABLE test(id INT) ENGINE = %s\n", $engine)) || + !mysqli_query($link, "INSERT INTO test(id) VALUES (1)")) + printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + + if (!$res = mysqli_query($link, "SELECT COUNT(id) AS _num_rows FROM test")) + printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + + $row = mysqli_fetch_assoc($res); + mysqli_free_result($res); + + if ($row['_num_rows'] != 1) + printf("[003] Expecting 1 got %s\n", $row['_num_rows']); + + mysqli_close($link); + + $link = mysqli_init(); + if (true !== mysqli_options($link, MYSQLI_INIT_COMMAND, "INSERT INTO test(id) VALUES (2)")) + printf("[004] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + + if (!my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) + printf("[005] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", + $host, $user, $db, $port, $socket); + + if (!$res = mysqli_query($link, "SELECT COUNT(id) AS _num_rows FROM test")) + printf("[006] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + + $row = mysqli_fetch_assoc($res); + mysqli_free_result($res); + + if ($row['_num_rows'] != 2) + printf("[007] Expecting 1 got %s\n", $row['_num_rows']); + + mysqli_close($link); + + $link = mysqli_init(); + if (true !== mysqli_options($link, MYSQLI_INIT_COMMAND, "INSERT INTO test(i_do_no_exist) VALUES (2)")) + printf("[008] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + + mysqli_close($link); + + $link = mysqli_init(); + if (true !== mysqli_options($link, MYSQLI_INIT_COMMAND, "INSERT INTO test(i_do_no_exist) VALUES (2)")) + printf("[009] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + + if (!my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) + printf("[010] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", + $host, $user, $db, $port, $socket); + print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- -done! +Warning: mysqli_real_connect(): (%s/%d): %s in %s on line %d +[010] Cannot connect to the server using %s +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 d5a5bf45c..81d8ffef6 100644 --- a/ext/mysqli/tests/mysqli_options_openbasedir.phpt +++ b/ext/mysqli/tests/mysqli_options_openbasedir.phpt @@ -11,7 +11,7 @@ open_basedir="." --FILE-- <?php require_once('connect.inc'); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); if (false !== mysqli_options($link, MYSQLI_OPT_LOCAL_INFILE, 1)) diff --git a/ext/mysqli/tests/mysqli_pconn_disabled.phpt b/ext/mysqli/tests/mysqli_pconn_disabled.phpt index 609361c5c..ee0efc4e5 100644 --- a/ext/mysqli/tests/mysqli_pconn_disabled.phpt +++ b/ext/mysqli/tests/mysqli_pconn_disabled.phpt @@ -20,7 +20,7 @@ mysqli.max_links=2 include "connect.inc"; $host = 'p:' . $host; - if (!$link1 = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + if (!$link1 = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { // automatic downgrade to normal connections has failed printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s, [%d] %s\n", $host, $user, $db, $port, $socket, mysqli_connect_errno(), mysqli_connect_error()); @@ -29,7 +29,7 @@ mysqli.max_links=2 printf("[002] Cannot set user variable to check if we got the same persistent connection, [%d] %s\n", mysqli_errno($link1), mysqli_error($link1)); - if (!$link2 = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + if (!$link2 = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { // automatic downgrade to normal connections has failed printf("[003] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s, [%d] %s\n", $host, $user, $db, $port, $socket, mysqli_connect_errno(), mysqli_connect_error()); @@ -57,9 +57,9 @@ mysqli.max_links=2 print "done!"; ?> --EXPECTF-- -Warning: mysqli_connect(): Persistent connections are disabled. Downgrading to normal in %s on line %d +Warning: my_mysqli_connect(): Persistent connections are disabled. Downgrading to normal in %s on line %d -Warning: mysqli_connect(): Persistent connections are disabled. Downgrading to normal in %s on line %d +Warning: my_mysqli_connect(): Persistent connections are disabled. Downgrading to normal in %s on line %d Connecction 1 - SELECT @pcondisabled -> 'Connection 1' Connecction 2 - SELECT @pcondisabled -> '' done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_pconn_kill.phpt b/ext/mysqli/tests/mysqli_pconn_kill.phpt index d25d5321b..297dd4cb6 100755 --- a/ext/mysqli/tests/mysqli_pconn_kill.phpt +++ b/ext/mysqli/tests/mysqli_pconn_kill.phpt @@ -18,7 +18,7 @@ mysqli.max_persistent=2 require_once("table.inc"); $host = 'p:' . $host; - if (!$plink = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$plink = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -66,7 +66,7 @@ mysqli.max_persistent=2 // On PHP side this should do nothing. PHP should not try to close the connection or something. @mysqli_close($plink); - if (!$plink = @mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$plink = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[011] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); if (!$res3 = @mysqli_query($plink, 'SELECT id FROM test ORDER BY id LIMIT 1')) { @@ -79,7 +79,7 @@ mysqli.max_persistent=2 // remove the "p:<host>" from the host variable $host = substr($host, 2); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[013] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); if (!$res4 = mysqli_query($link, 'SELECT id FROM test ORDER BY id LIMIT 1')) @@ -89,5 +89,9 @@ mysqli.max_persistent=2 mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- 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 9f8bfe7d7..84cd11e59 100644 --- a/ext/mysqli/tests/mysqli_pconn_limits.phpt +++ b/ext/mysqli/tests/mysqli_pconn_limits.phpt @@ -28,7 +28,7 @@ mysqli.max_links=-1 mysqli_free_result($res); printf("Regular connection 1 - '%s'\n", $row['_desc']); - if (!$link2 = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link2 = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[002] Cannot open second regular connection, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); @@ -41,7 +41,7 @@ mysqli.max_links=-1 printf("Regular connection 2 - '%s'\n", $row['_desc']); $host = 'p:' . $host; - if (!$plink = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$plink = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[004] Cannot create persistent connection using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s, [%d] %s\n", $host, $user, $db, $port, $socket, mysqli_connect_errno(), mysqli_connect_error()); @@ -54,7 +54,7 @@ mysqli.max_links=-1 mysqli_free_result($res); printf("Persistent connection 1 - '%s'\n", $row['_desc']); - if (!$plink2 = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$plink2 = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[006] Cannot create persistent connection using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s, [%d] %s\n", $host, $user, $db, $port, $socket, mysqli_connect_errno(), mysqli_connect_error()); @@ -68,7 +68,7 @@ mysqli.max_links=-1 printf("Persistent connection 2 - '%s'\n", $row['_desc']); $plink3 = mysqli_init(); - if (!mysqli_real_connect($plink3, $host, $user, $passwd, $db, $port, $socket)) + if (!my_mysqli_real_connect($plink3, $host, $user, $passwd, $db, $port, $socket)) printf("[008] Cannot create persistent connection using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s, [%d] %s\n", $host, $user, $db, $port, $socket, mysqli_connect_errno(), mysqli_connect_error()); @@ -88,6 +88,10 @@ mysqli.max_links=-1 mysqli_close($plink3); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Regular connection 1 - 'works..' Regular connection 2 - 'works...' diff --git a/ext/mysqli/tests/mysqli_pconn_max_links.phpt b/ext/mysqli/tests/mysqli_pconn_max_links.phpt index ceac64489..3ccb76136 100644 --- a/ext/mysqli/tests/mysqli_pconn_max_links.phpt +++ b/ext/mysqli/tests/mysqli_pconn_max_links.phpt @@ -11,13 +11,14 @@ Persistent connections and mysqli.max_links die("skip mysqlnd only test"); // we need a second DB user to test for a possible flaw in the ext/mysql[i] code - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die(sprintf("skip Cannot connect [%d] %s", mysqli_connect_errno(), mysqli_connect_error())); mysqli_query($link, 'DROP USER pcontest'); - mysqli_query($link, 'DROP USER pcontest@localhost'); + mysqli_query($link, 'DROP USER pcontest@localhost'); + if (!mysqli_query($link, 'CREATE USER pcontest@"%" IDENTIFIED BY "pcontest"') || - !mysqli_query($link, 'CREATE USER pcontest@localhost IDENTIFIED BY "pcontest"')) { + !mysqli_query($link, 'CREATE USER pcontest@localhost IDENTIFIED BY "pcontest"')) { printf("skip Cannot create second DB user [%d] %s", mysqli_errno($link), mysqli_error($link)); mysqli_close($link); die("skip CREATE USER failed"); @@ -25,21 +26,20 @@ Persistent connections and mysqli.max_links // we might be able to specify the host using CURRENT_USER(), but... if (!mysqli_query($link, sprintf("GRANT SELECT ON TABLE %s.test TO pcontest@'%%'", $db)) || - !mysqli_query($link, sprintf("GRANT SELECT ON TABLE %s.test TO pcontest@'localhost'", $db))) { + !mysqli_query($link, sprintf("GRANT SELECT ON TABLE %s.test TO pcontest@'localhost'", $db))) { printf("skip Cannot GRANT SELECT to second DB user [%d] %s", mysqli_errno($link), mysqli_error($link)); mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest'); - mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest@localhost'); - mysqli_query($link, 'DROP USER pcontest@localhost'); + mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest@localhost'); + mysqli_query($link, 'DROP USER pcontest@localhost'); mysqli_query($link, 'DROP USER pcontest'); mysqli_close($link); die("skip GRANT failed"); } - if (!($link_pcontest = @mysqli_connect($host, 'pcontest', 'pcontest', $db, $port, $socket))) { - die(":)"); - mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest'); - mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest@localhost'); - mysqli_query($link, 'DROP USER pcontest@localhost'); + if (!($link_pcontest = @my_mysqli_connect($host, 'pcontest', 'pcontest', $db, $port, $socket))) { + mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest'); + mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest@localhost'); + mysqli_query($link, 'DROP USER pcontest@localhost'); mysqli_query($link, 'DROP USER pcontest'); mysqli_close($link); die("skip CONNECT using new user failed"); @@ -54,7 +54,7 @@ mysqli.max_persistent=2 require_once("connect.inc"); require_once('table.inc'); - if (!$plink = mysqli_connect('p:' . $host, 'pcontest', 'pcontest', $db, $port, $socket)) + if (!$plink = my_mysqli_connect('p:' . $host, 'pcontest', 'pcontest', $db, $port, $socket)) printf("[001] Cannot connect using the second DB user created during SKIPIF, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); @@ -107,7 +107,7 @@ mysqli.max_persistent=2 printf("[009] Persistent connection has not been killed\n"); // this fails and we have 0 (<= $num_plinks) connections - if ($plink = @mysqli_connect('p:' . $host, 'pcontest', 'pcontest', $db, $port, $socket)) + if ($plink = @my_mysqli_connect('p:' . $host, 'pcontest', 'pcontest', $db, $port, $socket)) printf("[010] Can connect using the old password, [%d] %s\n", mysqli_connect_errno($link), mysqli_connect_error($link)); @@ -123,7 +123,7 @@ mysqli.max_persistent=2 if ($num_plinks_kill > $num_plinks) printf("[011] Expecting Active Persistent Links < %d, got %d\n", $num_plinks, $num_plinks_kill); - if (!$plink = mysqli_connect('p:' . $host, 'pcontest', 'newpass', $db, $port, $socket)) + if (!$plink = my_mysqli_connect('p:' . $host, 'pcontest', 'newpass', $db, $port, $socket)) printf("[012] Cannot connect using the new password, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); @@ -137,7 +137,7 @@ mysqli.max_persistent=2 mysqli_free_result($res); var_dump($row); - if ($plink2 = mysqli_connect('p:' . $host, 'pcontest', 'newpass', $db, $port, $socket)) + if ($plink2 = my_mysqli_connect('p:' . $host, 'pcontest', 'newpass', $db, $port, $socket)) printf("[015] Can open more persistent connections than allowed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); @@ -158,6 +158,22 @@ mysqli.max_persistent=2 mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest'); +mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest@localhost'); +mysqli_query($link, 'DROP USER pcontest@localhost'); +mysqli_query($link, 'DROP USER pcontest'); + +mysqli_close($link); +?> --EXPECTF-- array(2) { [%u|b%"id"]=> @@ -172,5 +188,5 @@ array(2) { %unicode|string%(1) "a" } -Warning: mysqli_connect(): Too many open persistent links (%d) in %s on line %d +Warning: my_mysqli_connect(): Too many open persistent links (%d) in %s on line %d done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_pconn_reuse.phpt b/ext/mysqli/tests/mysqli_pconn_reuse.phpt index c2808579a..8a43e7c30 100644 --- a/ext/mysqli/tests/mysqli_pconn_reuse.phpt +++ b/ext/mysqli/tests/mysqli_pconn_reuse.phpt @@ -20,7 +20,7 @@ mysqli.max_links=2 include "connect.inc"; $host = 'p:' . $host; - if (!$link1 = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + if (!$link1 = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s, [%d] %s\n", $host, $user, $db, $port, $socket, mysqli_connect_errno(), mysqli_connect_error()); } @@ -28,7 +28,7 @@ mysqli.max_links=2 printf("[002] Cannot set user variable to check if we got the same persistent connection, [%d] %s\n", mysqli_errno($link1), mysqli_error($link1)); - if (!$link2 = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + if (!$link2 = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { printf("[003] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s, [%d] %s\n", $host, $user, $db, $port, $socket, mysqli_connect_errno(), mysqli_connect_error()); } @@ -63,7 +63,7 @@ mysqli.max_links=2 mysqli_close($link2); /* reuse of existing persistent connection expected! */ - if (!$link2 = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + if (!$link2 = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { printf("[008] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s, [%d] %s\n", $host, $user, $db, $port, $socket, mysqli_connect_errno(), mysqli_connect_error()); } diff --git a/ext/mysqli/tests/mysqli_pconnect.phpt b/ext/mysqli/tests/mysqli_pconnect.phpt index c499cffba..57b44ebaf 100644 --- a/ext/mysqli/tests/mysqli_pconnect.phpt +++ b/ext/mysqli/tests/mysqli_pconnect.phpt @@ -14,7 +14,7 @@ if (!stristr(mysqli_get_client_info(), 'mysqlnd')) include "connect.inc"; $host = 'p:' . $host; - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[002] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -23,7 +23,7 @@ if (!stristr(mysqli_get_client_info(), 'mysqlnd')) $num = 20; $connections = array(); for ($i = 0; $i < $num; $i++) { - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[003] Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); $connections[] = $link; } @@ -39,7 +39,7 @@ if (!stristr(mysqli_get_client_info(), 'mysqlnd')) $connections = array(); $num = 20; for ($i = 0; $i < $num; $i++) { - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[004] Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); $connections[] = $link; } @@ -55,7 +55,7 @@ if (!stristr(mysqli_get_client_info(), 'mysqlnd')) unset($connections[$index]); } else { $left--; - if (!$connections[$index] = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$connections[$index] = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[004] Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); } flush(); diff --git a/ext/mysqli/tests/mysqli_ping.phpt b/ext/mysqli/tests/mysqli_ping.phpt index ff55bc29f..80a2a20a2 100644 --- a/ext/mysqli/tests/mysqli_ping.phpt +++ b/ext/mysqli/tests/mysqli_ping.phpt @@ -1,9 +1,9 @@ --TEST-- mysqli_ping() --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- diff --git a/ext/mysqli/tests/mysqli_poll.phpt b/ext/mysqli/tests/mysqli_poll.phpt index 1bfae4bdb..c691835f3 100644 --- a/ext/mysqli/tests/mysqli_poll.phpt +++ b/ext/mysqli/tests/mysqli_poll.phpt @@ -17,7 +17,7 @@ if (!$IS_MYSQLND) function get_connection() { global $host, $user, $passwd, $db, $port, $socket; - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); return $link; } @@ -53,14 +53,25 @@ if (!$IS_MYSQLND) printf("[009] Expecting int/0 got %s/%s\n", gettype($tmp), var_export($tmp, true)); - function poll_async($offset, $links, $errors, $reject, $exp_ready) { + function poll_async($offset, $link, $links, $errors, $reject, $exp_ready, $use_oo_syntax) { - if ($exp_ready !== ($tmp = mysqli_poll($links, $errors, $reject, 0, 1000))) - printf("[%03d + 1] There should be %d links ready to read from, %d ready\n", - $exp_ready, $tmp); + if ($use_oo_syntax) { + if ($exp_ready !== ($tmp = $link->poll($links, $errors, $reject, 0, 1000))) + printf("[%03d + 1] There should be %d links ready to read from, %d ready\n", + $exp_ready, $tmp); + } else { + if ($exp_ready !== ($tmp = mysqli_poll($links, $errors, $reject, 0, 1000))) + printf("[%03d + 1] There should be %d links ready to read from, %d ready\n", + $exp_ready, $tmp); + } foreach ($links as $mysqli) { - if (is_object($res = mysqli_reap_async_query($mysqli))) { + if ($use_oo_syntax) { + $res = $mysqli->reap_async_query(); + } else { + $res = mysqli_reap_async_query($mysqli); + } + if (is_object($res)) { printf("[%03d + 2] Can fetch resultset although no query has been run!\n", $offset); } else if (mysqli_errno($mysqli) > 0) { printf("[%03d + 3] Error indicated through links array: %d/%s", @@ -85,7 +96,14 @@ if (!$IS_MYSQLND) $links = array($link); $errors = array($link); $reject = array($link); - poll_async(10, $links, $errors, $reject, 0); + poll_async(10, $link, $links, $errors, $reject, 0, false); + mysqli_close($link); + + $link = get_connection(); + $links = array($link); + $errors = array($link); + $reject = array($link); + poll_async(11, $link, $links, $errors, $reject, 0, true); mysqli_close($link); // Connections on which no query has been send - 2 @@ -94,7 +112,7 @@ if (!$IS_MYSQLND) $links = array($link, $link); $errors = array($link, $link); $reject = array(); - poll_async(11, $links, $errors, $reject, 0); + poll_async(12, $link, $links, $errors, $reject, 0, false); // Connections on which no query has been send - 3 // Difference: pass two connections @@ -102,7 +120,7 @@ if (!$IS_MYSQLND) $links = array($link, get_connection()); $errors = array($link, $link); $reject = array(); - poll_async(12, $links, $errors, $reject, 0); + poll_async(13, $link, $links, $errors, $reject, 0, false); // Reference mess... $link = get_connection(); @@ -110,15 +128,16 @@ if (!$IS_MYSQLND) $errors = array($link); $ref_errors =& $errors; $reject = array(); - poll_async(13, $links, $ref_errors, $reject, 0); + poll_async(14, $link, $links, $ref_errors, $reject, 0, false); print "done!"; ?> --EXPECTF-- [010 + 6] Rejecting thread %d: 0/ [011 + 6] Rejecting thread %d: 0/ -[011 + 6] Rejecting thread %d: 0/ [012 + 6] Rejecting thread %d: 0/ [012 + 6] Rejecting thread %d: 0/ [013 + 6] Rejecting thread %d: 0/ +[013 + 6] Rejecting thread %d: 0/ +[014 + 6] Rejecting thread %d: 0/ done! diff --git a/ext/mysqli/tests/mysqli_poll_kill.phpt b/ext/mysqli/tests/mysqli_poll_kill.phpt index 2b31ef7b9..73382b730 100644 --- a/ext/mysqli/tests/mysqli_poll_kill.phpt +++ b/ext/mysqli/tests/mysqli_poll_kill.phpt @@ -17,7 +17,7 @@ if (!$IS_MYSQLND) function get_connection() { global $host, $user, $passwd, $db, $port, $socket; - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); return $link; } diff --git a/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt b/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt index 443259887..56f9182f4 100644 --- a/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt +++ b/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt @@ -17,7 +17,7 @@ if (!$IS_MYSQLND) function get_connection() { global $host, $user, $passwd, $db, $port, $socket; - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); return $link; } @@ -153,6 +153,23 @@ if (!$IS_MYSQLND) print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS bogus")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_query($link, "DROP PROCEDURE IF EXISTS p"); + +mysqli_close($link); +?> + --EXPECTF-- [003] 'SELECT' caused 1064 [003] 'UPDATE test SET id = 101 WHERE id > 3' caused 1062 diff --git a/ext/mysqli/tests/mysqli_poll_reference.phpt b/ext/mysqli/tests/mysqli_poll_reference.phpt index eb14e7404..332f871af 100644 --- a/ext/mysqli/tests/mysqli_poll_reference.phpt +++ b/ext/mysqli/tests/mysqli_poll_reference.phpt @@ -10,13 +10,12 @@ require_once('skipifconnectfailure.inc'); if (!$IS_MYSQLND) die("skip mysqlnd only feature, compile PHP using --with-mysqli=mysqlnd"); -if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip cannot connect"); -if (mysqli_server_version($link) < 50012)) +if (mysqli_server_version($link) < 50012) die("skip Test needs SQL function SLEEP() available as of MySQL 5.0.12"); -mysqli_close($link); ?> --FILE-- <?php @@ -25,7 +24,7 @@ mysqli_close($link); function get_connection() { global $host, $user, $passwd, $db, $port, $socket; - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); return $link; } diff --git a/ext/mysqli/tests/mysqli_prepare.phpt b/ext/mysqli/tests/mysqli_prepare.phpt index 8c1d8bbd0..0737aba83 100644 --- a/ext/mysqli/tests/mysqli_prepare.phpt +++ b/ext/mysqli/tests/mysqli_prepare.phpt @@ -116,6 +116,20 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test2")) + printf("[c003] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECTF-- bool(false) done! diff --git a/ext/mysqli/tests/mysqli_prepare_no_object.phpt b/ext/mysqli/tests/mysqli_prepare_no_object.phpt index de62b5739..3d022f440 100644 --- a/ext/mysqli/tests/mysqli_prepare_no_object.phpt +++ b/ext/mysqli/tests/mysqli_prepare_no_object.phpt @@ -1,9 +1,9 @@ --TEST-- mysqli_prepare() - no object on failure --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -21,7 +21,7 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); - if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket)) + if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) printf("[003] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -35,6 +35,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php +require_once("clean_table.inc"); +?> --EXPECTF-- a) [1065] Query was empty b) [1065] Query was empty diff --git a/ext/mysqli/tests/mysqli_ps_select_union.phpt b/ext/mysqli/tests/mysqli_ps_select_union.phpt new file mode 100644 index 000000000..fed81b309 --- /dev/null +++ b/ext/mysqli/tests/mysqli_ps_select_union.phpt @@ -0,0 +1,275 @@ +--TEST-- +Prepared Statements and SELECT UNION +--SKIPIF-- +<?php +require_once('skipif.inc'); +require_once('skipifemb.inc'); +require_once('skipifconnectfailure.inc'); +?> +--FILE-- +<?php + require_once("connect.inc"); + require_once("table.inc"); + + // Regular (non-prepared) queries + print "Using CAST('somestring' AS CHAR)...\n"; + if (!($res = $link->query("SELECT CAST('one' AS CHAR) AS column1 UNION SELECT CAST('three' AS CHAR) UNION SELECT CAST('two' AS CHAR)"))) + printf("[001] [%d] %s\n", $link->errno, $link->error); + + $data = array(); + while ($row = $res->fetch_assoc()) { + $data[] = $row['column1']; + var_dump($row['column1']); + } + $res->free(); + + // Prepared Statements + if (!($stmt = $link->prepare("SELECT CAST('one' AS CHAR) AS column1 UNION SELECT CAST('three' AS CHAR) UNION SELECT CAST('two' AS CHAR)"))) + printf("[002] [%d] %s\n", $link->errno, $link->error); + + $column1 = null; + if (!$stmt->execute() || !$stmt->bind_result($column1)) + printf("[003] [%d] %s\n", $stmt->errno, $stmt->error); + + $index = 0; + while ($stmt->fetch()) { + if ($data[$index] != $column1) { + printf("[004] Row %d, expecting %s/%s got %s/%s\n", + $index + 1, gettype($data[$index]), $data[$index], gettype($column1), $column1); + } + $index++; + } + $stmt->close(); + + if ($IS_MYSQLND) { + /* + Advantage mysqlnd - + The metadata mysqlnd has availabe after prepare is better than + the one made availabe by the MySQL Client Library (libmysql). + "libmysql" will give wrong results and that is OK - + http://bugs.mysql.com/bug.php?id=47483 + */ + if (!($stmt = $link->prepare("SELECT CAST('one' AS CHAR) AS column1 UNION SELECT CAST('three' AS CHAR) UNION SELECT CAST('two' AS CHAR)"))) + printf("[005] [%d] %s\n", $link->errno, $link->error); + + $column1 = null; + /* Note: bind_result before execute */ + if (!$stmt->bind_result($column1) || !$stmt->execute()) + printf("[006] [%d] %s\n", $stmt->errno, $stmt->error); + + $index = 0; + while ($stmt->fetch()) { + if ($data[$index] != $column1) { + printf("[007] Row %d, expecting %s/%s got %s/%s\n", + $index + 1, gettype($data[$index]), $data[$index], gettype($column1), $column1); + } + $index++; + } + $stmt->close(); + } + + // Regular (non-prepared) queries + print "Mixing CAST('somestring'AS CHAR), integer and CAST(integer AS CHAR)...\n"; + if (!($res = $link->query("SELECT 1 AS column1 UNION SELECT CAST('three' AS CHAR) UNION SELECT CAST(2 AS CHAR)"))) + printf("[008] [%d] %s\n", $link->errno, $link->error); + + $data = array(); + while ($row = $res->fetch_assoc()) { + $data[] = $row['column1']; + } + $res->free(); + + // Prepared Statements + if (!($stmt = $link->prepare("SELECT 1 AS column1 UNION SELECT CAST('three' AS CHAR) UNION SELECT CAST(2 AS CHAR)"))) + printf("[009] [%d] %s\n", $link->errno, $link->error); + + $column1 = null; + if (!$stmt->execute() || !$stmt->bind_result($column1)) + printf("[010] [%d] %s\n", $stmt->errno, $stmt->error); + + $index = 0; + while ($stmt->fetch()) { + if ($data[$index] != $column1) { + printf("[011] Row %d, expecting %s/%s got %s/%s\n", + $index + 1, gettype($data[$index]), $data[$index], gettype($column1), $column1); + } + var_dump($column1); + $index++; + } + $stmt->close(); + + if ($IS_MYSQLND) { + /* Advantage mysqlnd - see above... */ + if (!($stmt = $link->prepare("SELECT 1 AS column1 UNION SELECT CAST('three' AS CHAR) UNION SELECT CAST(2 AS CHAR)"))) + printf("[012] [%d] %s\n", $link->errno, $link->error); + + $column1 = null; + if (!$stmt->bind_result($column1) || !$stmt->execute()) + printf("[013] [%d] %s\n", $stmt->errno, $stmt->error); + + $index = 0; + while ($stmt->fetch()) { + if ($data[$index] != $column1) { + printf("[014] Row %d, expecting %s/%s got %s/%s\n", + $index + 1, gettype($data[$index]), $data[$index], gettype($column1), $column1); + } + $index++; + } + $stmt->close(); + } + + print "Using integer only...\n"; + if (!($res = $link->query("SELECT 1 AS column1 UNION SELECT 303 UNION SELECT 2"))) + printf("[015] [%d] %s\n", $link->errno, $link->error); + + $data = array(); + while ($row = $res->fetch_assoc()) { + $data[] = $row['column1']; + } + $res->free(); + + // Prepared Statements + if (!($stmt = $link->prepare("SELECT 1 AS column1 UNION SELECT 303 UNION SELECT 2"))) + printf("[016] [%d] %s\n", $link->errno, $link->error); + + $column1 = null; + if (!$stmt->execute() || !$stmt->bind_result($column1)) + printf("[017] [%d] %s\n", $stmt->errno, $stmt->error); + + $index = 0; + while ($stmt->fetch()) { + if ($data[$index] != $column1) { + printf("[018] Row %d, expecting %s/%s got %s/%s\n", + $index + 1, gettype($data[$index]), $data[$index], gettype($column1), $column1); + } + var_dump($column1); + $index++; + } + $stmt->close(); + + if ($IS_MYSQLND) { + /* Advantage mysqlnd - see above */ + if (!($stmt = $link->prepare("SELECT 1 AS column1 UNION SELECT 303 UNION SELECT 2"))) + printf("[019] [%d] %s\n", $link->errno, $link->error); + + $column1 = null; + if (!$stmt->bind_result($column1) || !$stmt->execute()) + printf("[020] [%d] %s\n", $stmt->errno, $stmt->error); + + $index = 0; + while ($stmt->fetch()) { + if ($data[$index] != $column1) { + printf("[021] Row %d, expecting %s/%s got %s/%s\n", + $index + 1, gettype($data[$index]), $data[$index], gettype($column1), $column1); + } + $index++; + } + $stmt->close(); + } + + print "Testing bind_param(), strings only...\n"; + $two = 'two'; + $three = 'three'; + if (!($stmt = $link->prepare("SELECT 'one' AS column1 UNION SELECT ? UNION SELECT ?"))) + printf("[022] [%d] %s\n", $stmt->errno, $stmt->error); + + $column1 = null; + if (!$stmt->bind_param('ss', $three, $two) || !$stmt->execute() || !$stmt->bind_result($column1)) + printf("[023] [%d] %s\n", $stmt->errno, $stmt->error); + + $index = 0; + $data = array(); + while ($stmt->fetch()) { + $data[$index++] = $column1; + var_dump($column1); + } + $stmt->close(); + + if ($IS_MYSQLND) { + /* Advantage mysqlnd - see above */ + $two = 'two'; + $three = 'three'; + if (!($stmt = $link->prepare("SELECT 'one' AS column1 UNION SELECT ? UNION SELECT ?"))) + printf("[024] [%d] %s\n", $stmt->errno, $stmt->error); + + $column1 = null; + if (!$stmt->bind_param('ss', $three, $two) || !$stmt->bind_result($column1) || !$stmt->execute()) + printf("[025] [%d] %s\n", $stmt->errno, $stmt->error); + + $index = 0; + while ($stmt->fetch()) { + if ($data[$index] != $column1) { + printf("[26] Row %d, expecting %s/%s, got %s/%s\n", + $index + 1, gettype($data[$index]), $data[$index], gettype($column1), $column1); + } + $index++; + } + $stmt->close(); + } + + print "Testing bind_param(), strings only, with CAST AS CHAR...\n"; + $two = 'two'; + $three = 'three beers are more than enough'; + if (!($stmt = $link->prepare("SELECT CAST('one' AS CHAR) AS column1 UNION SELECT CAST(? AS CHAR) UNION SELECT CAST(? AS CHAR)"))) + printf("[027] [%d] %s\n", $stmt->errno, $stmt->error); + + $column1 = null; + if (!$stmt->bind_param('ss', $three, $two) || !$stmt->execute() || !$stmt->bind_result($column1)) + printf("[028] [%d] %s\n", $stmt->errno, $stmt->error); + + $index = 0; + $data = array(); + while ($stmt->fetch()) { + $data[$index++] = $column1; + var_dump($column1); + } + $stmt->close(); + + if ($IS_MYSQLND) { + /* Advantage mysqlnd - see above */ + $two = 'two'; + $three = 'three beers are more than enough'; + if (!($stmt = $link->prepare("SELECT CAST('one' AS CHAR) AS column1 UNION SELECT CAST(? AS CHAR) UNION SELECT CAST(? AS CHAR)"))) + printf("[029] [%d] %s\n", $stmt->errno, $stmt->error); + + $column1 = null; + if (!$stmt->bind_param('ss', $three, $two) || !$stmt->bind_result($column1) || !$stmt->execute()) + printf("[030] [%d] %s\n", $stmt->errno, $stmt->error); + + $index = 0; + while ($stmt->fetch()) { + if ($data[$index] != $column1) { + printf("[31] Row %d, expecting %s/%s, got %s/%s\n", + $index + 1, gettype($data[$index]), $data[$index], gettype($column1), $column1); + } + $index++; + } + $stmt->close(); + } + + $link->close(); + + print "done!"; +?> +--EXPECTF-- +Using CAST('somestring' AS CHAR)... +%unicode|string%(3) "one" +%unicode|string%(5) "three" +%unicode|string%(3) "two" +Mixing CAST('somestring'AS CHAR), integer and CAST(integer AS CHAR)... +%unicode|string%(1) "1" +%unicode|string%(5) "three" +%unicode|string%(1) "2" +Using integer only... +int(1) +int(303) +int(2) +Testing bind_param(), strings only... +%unicode|string%(3) "one" +%unicode|string%(5) "three" +%unicode|string%(3) "two" +Testing bind_param(), strings only, with CAST AS CHAR... +%unicode|string%(3) "one" +%unicode|string%(32) "three beers are more than enough" +%unicode|string%(3) "two" +done! diff --git a/ext/mysqli/tests/mysqli_query.phpt b/ext/mysqli/tests/mysqli_query.phpt index 12cba90df..0e45f0388 100644 --- a/ext/mysqli/tests/mysqli_query.phpt +++ b/ext/mysqli/tests/mysqli_query.phpt @@ -112,6 +112,20 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +@mysqli_query($link, "DROP FUNCTION IF EXISTS f"); +@mysqli_query($link, 'DROP PROCEDURE IF EXISTS p'); + +mysqli_close($link); +?> --EXPECTF-- array(1) { [%u|b%"valid"]=> diff --git a/ext/mysqli/tests/mysqli_query_local_infile_large.phpt b/ext/mysqli/tests/mysqli_query_local_infile_large.phpt new file mode 100644 index 000000000..306dfceab --- /dev/null +++ b/ext/mysqli/tests/mysqli_query_local_infile_large.phpt @@ -0,0 +1,93 @@ +--TEST-- +mysql_query(LOAD DATA LOCAL INFILE) with large data set (10MB) +--SKIPIF-- +<?php +require_once('skipif.inc'); +require_once('skipifconnectfailure.inc'); +?> +--INI-- +mysqli.allow_local_infile=1 +--FILE-- +<?php + // Create a large CVS file + $file = tempnam(sys_get_temp_dir(), 'mysqli_test.cvs'); + if (!$fp = fopen($file, 'w')) + printf("[001] Cannot create CVS file '%s'\n", $file); + + $data = str_repeat("a", 127) . ";" . str_repeat("b", 127) . "\n"; + + $runtime = 5; + $max_bytes = 1024 * 1024 * 10; + + $start = microtime(true); + $bytes = 0; + $rowno = 0; + while (($bytes < $max_bytes) && ((microtime(true) - $start) < $runtime)) { + if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1)) + $bytes += fwrite($fp, (binary)(++$rowno . ";" . $data)); + else + $bytes += fwrite($fp, ++$rowno . ";" . $data); + } + fclose($fp); + printf("Filesize in bytes: %d\nRows: %d\n", $bytes, $rowno); + + include "connect.inc"; + if (!($link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))) + printf("[002] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + + if (!mysqli_query($link, "DROP TABLE IF EXISTS test") || + !mysqli_query($link, "CREATE TABLE test(id INT, col1 VARCHAR(255), col2 VARCHAR(255)) ENGINE = " . $engine)) + printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + + 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("[006] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + + $row = mysqli_fetch_assoc($res); + if (($row["_num"] != $rowno)) + 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("[008] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + + $row = mysqli_fetch_assoc($res); + var_dump($row); + mysqli_free_result($res); + + mysqli_close($link); + print "done!"; +?> +--CLEAN-- +<?php +$file = tempnam(sys_get_temp_dir(), 'mysqli_test.cvs'); +if (file_exists($file)) + unlink($file); + +include "connect.inc"; +if (!($link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) + printf("[c002] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); +?> +--EXPECTF-- +Filesize in bytes: %d +Rows: %d +array(3) { + [%u|b%"id"]=> + %unicode|string%(%d) "%d" + [%u|b%"col1"]=> + %unicode|string%(127) "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + [%u|b%"col2"]=> + %unicode|string%(127) "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb" +} +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_query_stored_proc.phpt b/ext/mysqli/tests/mysqli_query_stored_proc.phpt index f419205ea..0ca71a40b 100644 --- a/ext/mysqli/tests/mysqli_query_stored_proc.phpt +++ b/ext/mysqli/tests/mysqli_query_stored_proc.phpt @@ -5,7 +5,7 @@ mysqli_query() - Stored Procedures require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); -if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error())); } if (mysqli_get_server_version($link) <= 50000) { @@ -150,6 +150,19 @@ END;')) { mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +@mysqli_query($link, "DROP PROCEDURE IS EXISTS p"); + +mysqli_close($link); +?> --EXPECTF-- array(2) { [%u|b%"id"]=> diff --git a/ext/mysqli/tests/mysqli_query_unicode.phpt b/ext/mysqli/tests/mysqli_query_unicode.phpt index c05f22a2f..478ccbd30 100644 --- a/ext/mysqli/tests/mysqli_query_unicode.phpt +++ b/ext/mysqli/tests/mysqli_query_unicode.phpt @@ -88,7 +88,7 @@ mysqli_close($link); /* Trying to test what Ramil suggests in http://bugs.mysql.com/bug.php?id=29576 However, this won't work, because we're lacking MYSQLI_SET_CHARSET_NAME. - if (ini_get("unicode.semantics")) { + if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1)) { if (mysqli_get_server_version() > 50002) { @mysqli_query($link, "DROP USER IF EXISTS 'тест'@'%'"); if (TRUE !== mysqli_query($link, "CREATE USER 'тест'@'%'")) { diff --git a/ext/mysqli/tests/mysqli_real_connect.phpt b/ext/mysqli/tests/mysqli_real_connect.phpt index 8f20c7edd..5e474d6d2 100644 --- a/ext/mysqli/tests/mysqli_real_connect.phpt +++ b/ext/mysqli/tests/mysqli_real_connect.phpt @@ -161,32 +161,37 @@ require_once('skipifconnectfailure.inc'); printf("[025] Usage of mysqli.default_host=p: did not fail\n") ; mysqli_close($link); } + @mysqli_close($link); } @var_dump($link); - if (NULL === ($tmp = mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket))) - printf("[026] Expecting not NULL, got %s/%s\n", gettype($tmp), $tmp); + if (NULL !== ($tmp = mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket))) + printf("[026] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_real_connect(): (%d/%d): Access denied for user '%s'@'%s' (using password: YES) in %s on line %d object(mysqli)#%d (%d) { [%u|b%"affected_rows"]=> NULL [%u|b%"client_info"]=> - %unicode|string%(%d) "%s" + %s [%u|b%"client_version"]=> int(%d) [%u|b%"connect_errno"]=> int(%d) [%u|b%"connect_error"]=> - %unicode|string%(%d) "%s" + %unicode|string%(%d) "%s [%u|b%"errno"]=> - int(%d) + %s [%u|b%"error"]=> - %unicode|string%(%d) "%s" + %s [%u|b%"field_count"]=> NULL [%u|b%"host_info"]=> @@ -208,4 +213,6 @@ object(mysqli)#%d (%d) { [%u|b%"warning_count"]=> NULL } -done! + +Warning: mysqli_real_connect(): Couldn't fetch mysqli in %s on line %d +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_real_connect_pconn.phpt b/ext/mysqli/tests/mysqli_real_connect_pconn.phpt index ad9645177..5dedd47c9 100644 --- a/ext/mysqli/tests/mysqli_real_connect_pconn.phpt +++ b/ext/mysqli/tests/mysqli_real_connect_pconn.phpt @@ -146,6 +146,10 @@ mysqli.max_persistent=10 print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_real_connect(): (%d/%d): Access denied for user '%s'@'%s' (using password: YES) in %s on line %d done! diff --git a/ext/mysqli/tests/mysqli_real_query.phpt b/ext/mysqli/tests/mysqli_real_query.phpt index 92961977f..8e3034415 100644 --- a/ext/mysqli/tests/mysqli_real_query.phpt +++ b/ext/mysqli/tests/mysqli_real_query.phpt @@ -89,6 +89,20 @@ ver_param;')) { print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +@mysqli_query($link, "DROP PROCEDURE IF EXISTS p"); +@mysqli_query($link, "DROP FUNCTION IF EXISTS f"); + +mysqli_close($link); +?> --EXPECTF-- array(1) { [%u|b%"valid"]=> diff --git a/ext/mysqli/tests/mysqli_reconnect.phpt b/ext/mysqli/tests/mysqli_reconnect.phpt index 68cffc3b2..7f05a20d2 100644 --- a/ext/mysqli/tests/mysqli_reconnect.phpt +++ b/ext/mysqli/tests/mysqli_reconnect.phpt @@ -15,7 +15,7 @@ mysqli.reconnect=1 require_once("connect.inc"); require_once("table.inc"); - if (!$link2 = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link2 = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot create second database connection, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/mysqli_report.phpt b/ext/mysqli/tests/mysqli_report.phpt index 7b421014d..dc927997f 100644 --- a/ext/mysqli/tests/mysqli_report.phpt +++ b/ext/mysqli/tests/mysqli_report.phpt @@ -85,7 +85,7 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); /* mysqli_stmt_execute() = mysql_stmt_execute cannot be tested from PHP */ - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[008] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); $stmt = mysqli_stmt_init($link); mysqli_stmt_prepare($stmt, "SELECT id FROM test WHERE id > ?"); @@ -105,7 +105,7 @@ require_once('skipifconnectfailure.inc'); // Check mysqli_report(MYSQLI_REPORT_OFF); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[010] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); $stmt = mysqli_stmt_init($link); mysqli_stmt_prepare($stmt, "FOO"); @@ -118,7 +118,7 @@ require_once('skipifconnectfailure.inc'); mysqli_stmt_close($stmt); mysqli_close($link); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[011] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); $stmt = mysqli_stmt_init($link); mysqli_stmt_prepare($stmt, "SELECT id FROM test WHERE id > ?"); @@ -139,8 +139,8 @@ require_once('skipifconnectfailure.inc'); already tested php_mysqli_throw_sql_exception() -> - mysqli_real_connect() - mysqli_connect() + my_mysqli_real_connect() + my_mysqli_connect() can't be tested: mysqli_query() via mysql_use_result()/mysql_store_result() */ @@ -149,7 +149,7 @@ require_once('skipifconnectfailure.inc'); try { - if ($link = mysqli_connect($host, $user . 'unknown_really', $passwd . 'non_empty', $db, $port, $socket)) + if ($link = my_mysqli_connect($host, $user . 'unknown_really', $passwd . 'non_empty', $db, $port, $socket)) printf("[012] Can connect to the server using host=%s, user=%s, passwd=***non_empty, dbname=%s, port=%s, socket=%s\n", $host, $user . 'unknown_really', $db, $port, $socket); mysqli_close($link); @@ -162,7 +162,7 @@ require_once('skipifconnectfailure.inc'); if (!$link = mysqli_init()) printf("[014] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); - if ($link = mysqli_real_connect($link, $host, $user . 'unknown_really', $passwd . 'non_empty', $db, $port, $socket)) + if ($link = my_mysqli_real_connect($link, $host, $user . 'unknown_really', $passwd . 'non_empty', $db, $port, $socket)) printf("[015] Can connect to the server using host=%s, user=%s, passwd=***non_empty, dbname=%s, port=%s, socket=%s\n", $host, $user . 'unknown_really', $db, $port, $socket); mysqli_close($link); @@ -191,7 +191,7 @@ require_once('skipifconnectfailure.inc'); mysqli_report(MYSQLI_REPORT_OFF); mysqli_report(MYSQLI_REPORT_INDEX); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[017] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); // this might cause a warning - no index used @@ -235,7 +235,7 @@ require_once('skipifconnectfailure.inc'); // mysqli_use_result(), mysqli_thread_safe(), mysqli_thread_id() mysqli_report(MYSQLI_REPORT_OFF); mysqli_close($link); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[024] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); if (!$stmt = mysqli_stmt_init($link)) @@ -280,6 +280,10 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_multi_query(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BAR; FOO' at line 1 in %s on line %d diff --git a/ext/mysqli/tests/mysqli_report_wo_ps.phpt b/ext/mysqli/tests/mysqli_report_wo_ps.phpt index 58aae0af1..08909264a 100644 --- a/ext/mysqli/tests/mysqli_report_wo_ps.phpt +++ b/ext/mysqli/tests/mysqli_report_wo_ps.phpt @@ -1,9 +1,9 @@ --TEST-- mysqli_report() --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -69,7 +69,7 @@ require_once('skipifconnectfailure.inc'); try { - if ($link = mysqli_connect($host, $user . 'unknown_really', $passwd . 'non_empty', $db, $port, $socket)) + if ($link = my_mysqli_connect($host, $user . 'unknown_really', $passwd . 'non_empty', $db, $port, $socket)) printf("[010] Can connect to the server using host=%s, user=%s, passwd=***non_empty, dbname=%s, port=%s, socket=%s\n", $host, $user . 'unknown_really', $db, $port, $socket); mysqli_close($link); @@ -82,7 +82,7 @@ require_once('skipifconnectfailure.inc'); if (!$link = mysqli_init()) printf("[012] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); - if ($link = mysqli_real_connect($link, $host, $user . 'unknown_really', $passwd . 'non_empty', $db, $port, $socket)) + if ($link = my_mysqli_real_connect($link, $host, $user . 'unknown_really', $passwd . 'non_empty', $db, $port, $socket)) printf("[013] Can connect to the server using host=%s, user=%s, passwd=***non_empty, dbname=%s, port=%s, socket=%s\n", $host, $user . 'unknown_really', $db, $port, $socket); mysqli_close($link); @@ -92,6 +92,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_multi_query(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'BAR; FOO' at line 1 in %s on line %d diff --git a/ext/mysqli/tests/mysqli_result_references.phpt b/ext/mysqli/tests/mysqli_result_references.phpt index fab24a7f9..b6bce0d98 100644 --- a/ext/mysqli/tests/mysqli_result_references.phpt +++ b/ext/mysqli/tests/mysqli_result_references.phpt @@ -39,7 +39,7 @@ require_once('skipifconnectfailure.inc'); mysqli_free_result($res); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[002] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -76,6 +76,10 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- array(7) refcount(2){ [0]=> diff --git a/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt b/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt index 07dac9ba8..384f85fbb 100644 --- a/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt +++ b/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt @@ -9,6 +9,9 @@ require_once('skipifconnectfailure.inc'); require_once('connect.inc'); if (!$IS_MYSQLND) die("skip Test for mysqlnd only"); + +if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1)) + die("skip (TODO) PHP 6.0 has a difference debug_zval_dump output format"); ?> <?php require_once('skipifemb.inc'); ?> --FILE-- @@ -30,6 +33,8 @@ if (!$IS_MYSQLND) $references[$idx]['id_ref'] = &$row['id']; $references[$idx++]['id_copy'] = $row['id']; } + + debug_zval_dump($references); mysqli_free_result($res); if (!(mysqli_real_query($link, "SELECT id, label FROM test ORDER BY id ASC LIMIT 2")) || @@ -52,7 +57,7 @@ if (!$IS_MYSQLND) print "done!"; ?> --EXPECTF-- -array(2) refcount(2){ +array(1) refcount(2){ [0]=> array(4) refcount(1){ [%u|b%"row_ref"]=> @@ -69,6 +74,24 @@ array(2) refcount(2){ [%u|b%"id_copy"]=> %unicode|string%(1) "1" refcount(1) } +} +array(2) refcount(2){ + [0]=> + array(4) refcount(1){ + [%u|b%"row_ref"]=> + &NULL refcount(2) + [%u|b%"row_copy"]=> + array(2) refcount(1){ + [%u|b%"id"]=> + %unicode|string%(1) "1" refcount(1) + [%u|b%"label"]=> + %unicode|string%(1) "a" refcount(1) + } + [%u|b%"id_ref"]=> + %unicode|string%(1) "1" refcount(1) + [%u|b%"id_copy"]=> + %unicode|string%(1) "1" refcount(1) + } [1]=> array(5) refcount(1){ [%u|b%"row_ref"]=> @@ -76,14 +99,14 @@ array(2) refcount(2){ [%u|b%"id"]=> &%unicode|string%(1) "2" refcount(2) [%u|b%"label"]=> - %unicode|string%(1) "b" refcount(3) + %unicode|string%(1) "b" refcount(2) } [%u|b%"row_copy"]=> array(2) refcount(1){ [%u|b%"id"]=> - %unicode|string%(1) "2" refcount(2) + %unicode|string%(1) "2" refcount(1) [%u|b%"label"]=> - %unicode|string%(1) "b" refcount(3) + %unicode|string%(1) "b" refcount(2) } [%u|b%"id_ref"]=> &%unicode|string%(1) "2" refcount(2) diff --git a/ext/mysqli/tests/mysqli_result_unclonable.phpt b/ext/mysqli/tests/mysqli_result_unclonable.phpt index 93cf66321..dfde9a78c 100644 --- a/ext/mysqli/tests/mysqli_result_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_result_unclonable.phpt @@ -1,16 +1,16 @@ --TEST-- Trying to clone mysqli_result object --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php include "connect.inc"; - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); diff --git a/ext/mysqli/tests/mysqli_rollback.phpt b/ext/mysqli/tests/mysqli_rollback.phpt index fef4cbb32..616f50da8 100644 --- a/ext/mysqli/tests/mysqli_rollback.phpt +++ b/ext/mysqli/tests/mysqli_rollback.phpt @@ -10,7 +10,7 @@ mysqli_rollback() require_once('connect.inc'); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { die(sprintf("skip Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket)); } @@ -40,7 +40,7 @@ mysqli_rollback() if (!is_null($tmp = @mysqli_rollback($link))) printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[003] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -80,6 +80,10 @@ mysqli_rollback() print "done!\n"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_rollback(): Couldn't fetch mysqli in %s on line %d done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_select_db.phpt b/ext/mysqli/tests/mysqli_select_db.phpt index c121d6650..bc774cfec 100644 --- a/ext/mysqli/tests/mysqli_select_db.phpt +++ b/ext/mysqli/tests/mysqli_select_db.phpt @@ -1,9 +1,9 @@ --TEST-- mysqli_select_db() --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -19,7 +19,7 @@ require_once('skipifconnectfailure.inc'); if (!is_null($tmp = @mysqli_select_db($link))) printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[003] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); diff --git a/ext/mysqli/tests/mysqli_send_query.phpt b/ext/mysqli/tests/mysqli_send_query.phpt index ccddfd233..53cf25093 100755 --- a/ext/mysqli/tests/mysqli_send_query.phpt +++ b/ext/mysqli/tests/mysqli_send_query.phpt @@ -26,7 +26,7 @@ if (!$TEST_EXPERIMENTAL) if (NULL !== ($tmp = @mysqli_send_query($link))) printf("[002] Expecting NULL/NULL, got %s/%s\n", gettype($tmp), $tmp); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { printf("[003] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); } diff --git a/ext/mysqli/tests/mysqli_set_charset.phpt b/ext/mysqli/tests/mysqli_set_charset.phpt index e10b3348b..baf97bd3d 100644 --- a/ext/mysqli/tests/mysqli_set_charset.phpt +++ b/ext/mysqli/tests/mysqli_set_charset.phpt @@ -14,7 +14,7 @@ if (!function_exists('mysqli_set_charset')) die("skip Function not available"); require_once('connect.inc'); -if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error())); if (!($res = mysqli_query($link, 'SELECT version() AS server_version')) || @@ -84,7 +84,7 @@ if ((($res = mysqli_query($link, 'SHOW CHARACTER SET LIKE "latin1"', MYSQLI_STOR printf("[011] Expecting boolean/false because of invalid character set, got %s/%s\n", gettype($ret), $ret); mysqli_close($link); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[012] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -125,6 +125,10 @@ if ((($res = mysqli_query($link, 'SHOW CHARACTER SET LIKE "latin1"', MYSQLI_STOR print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_set_charset(): Couldn't fetch mysqli in %s on line %d done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_set_local_infile_default.phpt b/ext/mysqli/tests/mysqli_set_local_infile_default.phpt index 167fc0f80..dd67bb32a 100644 --- a/ext/mysqli/tests/mysqli_set_local_infile_default.phpt +++ b/ext/mysqli/tests/mysqli_set_local_infile_default.phpt @@ -109,6 +109,10 @@ mysqli.allow_local_infile=1 print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'callback_simple' Callback: 0 diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt index b876389f1..5cb1459d8 100644 --- a/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt +++ b/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt @@ -10,7 +10,7 @@ if (!function_exists('mysqli_set_local_infile_handler')) die("skip - function not available."); require_once('connect.inc'); -if (!$link = mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { @@ -164,6 +164,10 @@ mysqli.allow_local_infile=1 print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'callback_simple' Callback: 0 diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt index 2ea5ceb0c..ec097fe2b 100644 --- a/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt +++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_bad_character.phpt @@ -13,7 +13,7 @@ if (!function_exists('mysqli_set_local_infile_handler')) if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { @@ -42,7 +42,7 @@ mysqli.allow_local_infile=1 printf("Callback: %d\n", $invocation++); - $num_chars = (ini_get('unicode.semantics')) ? (floor($buflen / 2) - 10) : ($buflen - 5); + $num_chars = (version_compare(PHP_VERSION, '5.9.9', '>') == 1) ? (floor($buflen / 2) - 10) : ($buflen - 5); $part1 = floor($num_chars / 2); $part2 = $num_chars - $part1; @@ -69,6 +69,10 @@ mysqli.allow_local_infile=1 mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'callback_bad_character' Callback: 0 diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt index 6c557201b..03f428882 100644 --- a/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt +++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_buffer_overflow.phpt @@ -13,7 +13,7 @@ require_once('connect.inc'); if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { @@ -54,6 +54,10 @@ mysqli.allow_local_infile=1 mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'callback_buffer_overflow' Callback: 0 diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt index d9335813b..cb8162db7 100644 --- a/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt +++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt @@ -13,7 +13,7 @@ require_once('connect.inc'); if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { @@ -59,6 +59,10 @@ mysqli.allow_local_infile=1 mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'callback_close_link' Callback: 0 diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt index 4bdb54b1c..7498e64f4 100644 --- a/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt +++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt @@ -13,7 +13,7 @@ require_once('connect.inc'); if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { @@ -58,6 +58,10 @@ mysqli.allow_local_infile=1 mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'callback_closefile' Callback: 0 diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt index 3bdf6bb78..7e2445889 100755 --- a/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt +++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt @@ -13,7 +13,7 @@ require_once('connect.inc'); if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { @@ -58,6 +58,10 @@ mysqli.allow_local_infile=1 mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'Closure object' Callback: 0 diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt index efb72d285..3757b61d9 100644 --- a/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt +++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt @@ -10,7 +10,7 @@ if (!function_exists('mysqli_set_local_infile_handler')) die("skip - function not available."); require_once('connect.inc'); -if (!$link = mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { @@ -58,6 +58,10 @@ mysqli.allow_local_infile=1 mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'callback_kill_link' Callback: 0 diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_negative_len.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_negative_len.phpt index 3b8813aeb..30a3bcc03 100644 --- a/ext/mysqli/tests/mysqli_set_local_infile_handler_negative_len.phpt +++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_negative_len.phpt @@ -13,7 +13,7 @@ require_once('connect.inc'); if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { @@ -54,6 +54,10 @@ mysqli.allow_local_infile=1 mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'callback_negative_len' Callback: 0 diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_nested_call.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_nested_call.phpt index 50be4a593..465dcdb9d 100644 --- a/ext/mysqli/tests/mysqli_set_local_infile_handler_nested_call.phpt +++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_nested_call.phpt @@ -13,7 +13,7 @@ require_once('connect.inc'); if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { @@ -101,6 +101,10 @@ mysqli.allow_local_infile=1 mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'callback_report_short_len' Callback - report_short_len(): 0 diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_new_query.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_new_query.phpt index 2858e4034..5ea82e93f 100644 --- a/ext/mysqli/tests/mysqli_set_local_infile_handler_new_query.phpt +++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_new_query.phpt @@ -13,7 +13,7 @@ require_once('connect.inc'); if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { @@ -66,6 +66,10 @@ mysqli.allow_local_infile=1 mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'callback_new_query' Callback: 0 diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt index c92f93762..6354630c0 100644 --- a/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt +++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt @@ -13,7 +13,7 @@ require_once('connect.inc'); if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { @@ -57,6 +57,10 @@ mysqli.allow_local_infile=1 mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'callback_nofileop' Callback: 0 diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt index a4f20cb75..c30f6ea91 100644 --- a/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt +++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt @@ -10,7 +10,7 @@ if (!function_exists('mysqli_set_local_infile_handler')) die("skip - function not available."); require_once('connect.inc'); -if (!$link = mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { @@ -101,6 +101,10 @@ done!"; mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: tempnam(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (%s) in %s on line %d [005 + 1] Cannot create CVS file '' diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_replace_buffer.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_replace_buffer.phpt index 22f89fd05..cde8f4b12 100644 --- a/ext/mysqli/tests/mysqli_set_local_infile_handler_replace_buffer.phpt +++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_replace_buffer.phpt @@ -13,7 +13,7 @@ require_once('connect.inc'); if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { @@ -65,6 +65,10 @@ mysqli.allow_local_infile=1 mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'callback_replace_buffer' Callback: 0 diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_short_len.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_short_len.phpt index 78f2fced1..a793ac662 100644 --- a/ext/mysqli/tests/mysqli_set_local_infile_handler_short_len.phpt +++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_short_len.phpt @@ -13,7 +13,7 @@ require_once('connect.inc'); if (!$TEST_EXPERIMENTAL) die("skip - experimental (= unsupported) feature"); -if (!$link = mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { @@ -94,6 +94,10 @@ mysqli.allow_local_infile=1 mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'callback_short_len' Callback: 0 diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt index 4a321bf30..c89fc2152 100644 --- a/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt +++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt @@ -10,7 +10,7 @@ if (!function_exists('mysqli_set_local_infile_handler')) die("skip - function not available."); require_once('connect.inc'); -if (!$link = mysqli_connect($host, $user, $passwb, $db, $port, $socket)) +if (!$link = my_mysqli_connect($host, $user, $passwb, $db, $port, $socket)) die("skip Cannot connect to MySQL"); if (!$res = mysqli_query($link, 'SHOW VARIABLES LIKE "local_infile"')) { @@ -57,6 +57,10 @@ mysqli.allow_local_infile=1 mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Callback set to 'callback_unregister' Callback: 0 diff --git a/ext/mysqli/tests/mysqli_set_opt.phpt b/ext/mysqli/tests/mysqli_set_opt.phpt index d5c41827c..21aacd25f 100644 --- a/ext/mysqli/tests/mysqli_set_opt.phpt +++ b/ext/mysqli/tests/mysqli_set_opt.phpt @@ -1,9 +1,9 @@ --TEST-- mysqli_set_opt() --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -36,7 +36,7 @@ require_once('skipifconnectfailure.inc'); var_dump(mysqli_set_opt($link, MYSQLI_OPT_CONNECT_TIMEOUT, 10)); var_dump(mysqli_set_opt($link, MYSQLI_OPT_LOCAL_INFILE, 1)); var_dump(mysqli_set_opt($link, MYSQLI_INIT_COMMAND, 'SET AUTOCOMMIT=0')); - var_dump(mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)); + var_dump(my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)); var_dump(mysqli_set_opt($link, MYSQLI_READ_DEFAULT_GROUP, 'extra_my.cnf')); var_dump(mysqli_set_opt($link, MYSQLI_READ_DEFAULT_FILE, 'extra_my.cnf')); var_dump(mysqli_set_opt($link, MYSQLI_OPT_CONNECT_TIMEOUT, 10)); diff --git a/ext/mysqli/tests/mysqli_set_opt_numeric_and_datetime_as_unicode.phpt b/ext/mysqli/tests/mysqli_set_opt_numeric_and_datetime_as_unicode.phpt index 269e7dcf3..77047a19c 100644 --- a/ext/mysqli/tests/mysqli_set_opt_numeric_and_datetime_as_unicode.phpt +++ b/ext/mysqli/tests/mysqli_set_opt_numeric_and_datetime_as_unicode.phpt @@ -143,5 +143,9 @@ if (!stristr(mysqli_get_client_info(), "mysqlnd")) mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_sqlstate.phpt b/ext/mysqli/tests/mysqli_sqlstate.phpt index cdf0b5eec..0ed39f4ee 100644 --- a/ext/mysqli/tests/mysqli_sqlstate.phpt +++ b/ext/mysqli/tests/mysqli_sqlstate.phpt @@ -1,9 +1,9 @@ --TEST-- mysqli_sqlstate() --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- @@ -35,6 +35,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- NULL %s(5) "00000" diff --git a/ext/mysqli/tests/mysqli_ssl_set.phpt b/ext/mysqli/tests/mysqli_ssl_set.phpt index c53cdf138..e868f34f1 100644 --- a/ext/mysqli/tests/mysqli_ssl_set.phpt +++ b/ext/mysqli/tests/mysqli_ssl_set.phpt @@ -1,9 +1,9 @@ --TEST-- mysqli_ssl_set() - test is a stub! --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); if (!function_exists('mysqli_ssl_set')) die("skip function not available"); @@ -47,12 +47,12 @@ if (!function_exists('mysqli_ssl_set')) printf("[007] Expecting boolean/true, got %s/%s\n", gettype($tmp), $tmp); - If SSL setup is incorrect mysqli_real_connect() + If SSL setup is incorrect my_mysqli_real_connect() will return an error when you attempt to connect. ... and the above SSL setup should be always incorrect. - if (false !== ($tmp = mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket))) + if (false !== ($tmp = my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket))) printf("[008] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp); */ print "done!\n"; diff --git a/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt b/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt index 7059608cc..d4761dd6b 100644 --- a/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt +++ b/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt @@ -19,7 +19,7 @@ require_once('skipifconnectfailure.inc'); if (!is_null($tmp = @mysqli_stmt_affected_rows($link))) printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { printf("Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); } @@ -241,6 +241,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- [009] [%d] (error message varies with the MySQL Server version, check the error code) diff --git a/ext/mysqli/tests/mysqli_stmt_attr_get.phpt b/ext/mysqli/tests/mysqli_stmt_attr_get.phpt index 6156936f3..abedf56b2 100644 --- a/ext/mysqli/tests/mysqli_stmt_attr_get.phpt +++ b/ext/mysqli/tests/mysqli_stmt_attr_get.phpt @@ -62,5 +62,9 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! diff --git a/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt b/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt index cb7d507eb..26bbf9649 100644 --- a/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt +++ b/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt @@ -22,5 +22,9 @@ die("SKIP: prefetch isn't supported at the moment"); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- 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 c5d88bf27..7bc9882f8 100644 --- a/ext/mysqli/tests/mysqli_stmt_attr_set.phpt +++ b/ext/mysqli/tests/mysqli_stmt_attr_set.phpt @@ -1,5 +1,5 @@ --TEST-- -mysqli_stmt_attr_set() - KNOWN ISSUE: mysqlnd does not check for invalid codes +mysqli_stmt_attr_set() - mysqlnd does not check for invalid codes --SKIPIF-- <?php require_once('skipif.inc'); @@ -50,16 +50,19 @@ require_once('skipifconnectfailure.inc'); if (in_array($i, $valid_attr)) continue; $invalid_attr = $i; - if (false !== ($tmp = @mysqli_stmt_attr_set($stmt, $invalid_attr, 0))) + if (false !== ($tmp = @mysqli_stmt_attr_set($stmt, $invalid_attr, 0))) { printf("[006a] Expecting boolean/false for attribute %d, got %s/%s\n", $invalid_attr, gettype($tmp), $tmp); + } } for ($i = 0; $i < 10; $i++) { do { - $invalid_attr = mt_rand(-1 * PHP_INT_MAX + 1, PHP_INT_MAX); + $invalid_attr = mt_rand(-1 * (min(4294967296, PHP_INT_MAX) + 1), min(4294967296, PHP_INT_MAX)); } while (in_array($invalid_attr, $valid_attr)); - if (false !== ($tmp = @mysqli_stmt_attr_set($stmt, $invalid_attr, 0))) - printf("[006b] Expecting boolean/false for attribute %d, got %s/%s\n", $invalid_attr, gettype($tmp), $tmp); + if (false !== ($tmp = @mysqli_stmt_attr_set($stmt, $invalid_attr, 0))) { + /* Although it may be desired to get false neither the MySQL Client Library nor mysqlnd are supposed to detect invalid codes */ + printf("[006b] Expecting boolean/true for attribute %d, got %s/%s\n", $invalid_attr, gettype($tmp), $tmp); + } } $stmt->close(); @@ -259,5 +262,9 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param.phpt index 0b39a1b6d..9aaac9804 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param.phpt @@ -370,7 +370,7 @@ require_once('skipifconnectfailure.inc'); printf("[2014] Cannot find row id = %d\n", $values['id']); else if (isset($row['label']) && ($values['label'] != $row['label'])) printf("[2015] Expecting label = %s, got label = %s\n", $values['label'], $row['label']); - + mysqli_free_result($res); } @@ -383,6 +383,10 @@ require_once('skipifconnectfailure.inc'); printf("[021] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_bind_param(): Number of elements in type definition string doesn't match number of bind variables in %s on line %d 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 8fc9380b3..8f4a989bb 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,6 +328,10 @@ if (version_compare(PHP_VERSION, '5.3.0-dev') == -1) print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Regular, procedural, using variables int(1) diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt index 5aab1a677..a7d36743c 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt @@ -19,7 +19,7 @@ require_once('skipifconnectfailure.inc'); $foo = new foo; $foo->bar = "фубар"; - echo "Test 1: \n"; + echo "Test 1:\n"; $stmt = $link->prepare("SELECT ? FOO"); var_dump($foo); // here you can see the bar member var beeing a string $stmt->bind_param("s", $foo->bar); @@ -30,11 +30,11 @@ require_once('skipifconnectfailure.inc'); $stmt->free_result(); echo("$one\n\n"); - // it is getting worse. Binding the same var twice with different + // it is getting worse. Binding the same var twice with different // types you can get unexpected results (e.g. binary trash for the // string and misc data for the integer. See next 2 tests. - echo "Test 2: \n"; + echo "Test 2:\n"; $stmt = $link->prepare("SELECT ? FOO, ? BAR"); var_dump($foo); $stmt->bind_param("si", $foo->bar, $foo->bar); @@ -50,7 +50,7 @@ require_once('skipifconnectfailure.inc'); echo("$one - $two\n\n"); - echo "Test 3: \n"; + echo "Test 3:\n"; $stmt = $link->prepare("SELECT ? FOO, ? BAR"); var_dump($foo); $stmt->bind_param("is", $foo->bar, $foo->bar); @@ -60,89 +60,51 @@ require_once('skipifconnectfailure.inc'); $stmt->fetch(); $stmt->free_result(); echo("$one - $two\n\n"); - echo "done!\n"; + echo "done!"; +?> +--CLEAN-- +<?php + require_once("clean_table.inc"); ?> --EXPECTF-- -Test 1: -object(foo)#3 (1) { - ["bar"]=> - string(10) "фубар" -} -object(foo)#3 (1) { - ["bar"]=> - &string(10) "фубар" -} -фубар - -Test 2: -object(foo)#3 (1) { - ["bar"]=> - string(10) "фубар" -} ---- -object(foo)#3 (1) { - ["bar"]=> - &string(10) "фубар" -} ---- -object(foo)#3 (1) { - ["bar"]=> - &string(10) "фубар" -} ---- -фубар - 0 - -Test 3: -object(foo)#3 (1) { - ["bar"]=> - string(10) "фубар" -} -object(foo)#3 (1) { - ["bar"]=> - &string(10) "фубар" -} -0 - фубар - -done! ---UEXPECTF-- -Test 1: -object(foo)#3 (1) { - [u"bar"]=> - unicode(5) "фубар" +Test 1: +object(foo)#%d (1) { + [%u|b%"bar"]=> + %unicode|string%(%d) "фубар" } -object(foo)#3 (1) { - [u"bar"]=> - &unicode(5) "фубар" +object(foo)#%d (1) { + [%u|b%"bar"]=> + &%unicode|string%(%d) "фубар" } фубар -Test 2: -object(foo)#3 (1) { - [u"bar"]=> - unicode(5) "фубар" +Test 2: +object(foo)#%d (1) { + [%u|b%"bar"]=> + %unicode|string%(%d) "фубар" } --- -object(foo)#3 (1) { - [u"bar"]=> - &unicode(5) "фубар" +object(foo)#%d (1) { + [%u|b%"bar"]=> + &%unicode|string%(%d) "фубар" } --- -object(foo)#3 (1) { - [u"bar"]=> - &unicode(5) "фубар" +object(foo)#%d (1) { + [%u|b%"bar"]=> + &%unicode|string%(%d) "фубар" } --- фубар - 0 -Test 3: -object(foo)#3 (1) { - [u"bar"]=> - unicode(5) "фубар" +Test 3: +object(foo)#%d (1) { + [%u|b%"bar"]=> + %unicode|string%(%d) "фубар" } -object(foo)#3 (1) { - [u"bar"]=> - &unicode(5) "фубар" +object(foo)#%d (1) { + [%u|b%"bar"]=> + &%unicode|string%(%d) "фубар" } 0 - фубар -done! +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt index 8ca45691e..24d4314f1 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt @@ -151,12 +151,13 @@ require_once('skipifconnectfailure.inc'); printf("[025] [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt)); findRow(26, $link, $id_ref_ref, $label_ref_ref); + unset($id); + unset($label); $id = 102; $label = new stdClass(); $label->label = 'y'; $id_ref = &$GLOBALS['id']; $label_ref = &$label->label; - if (true !== ($tmp = mysqli_stmt_bind_param($stmt, "is", $id_ref, $label_ref))) printf("[027] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp); if (true !== @mysqli_stmt_execute($stmt)) @@ -199,5 +200,9 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done!
\ No newline at end of file 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 4e03c66f2..ab871ce95 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt @@ -120,5 +120,9 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result.phpt index a1b0e2caa..f5756740e 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result.phpt @@ -282,8 +282,12 @@ require_once('skipifconnectfailure.inc'); func_mysqli_stmt_bind_result($link, $engine, "b", "MEDIUMTEXT", "", 1640, $hint_str_or_unicode); /* Is this one related? http://bugs.php.net/bug.php?id=35759 */ - func_mysqli_stmt_bind_result($link, $engine, "b", "LONGBLOB", "", 1660); - func_mysqli_stmt_bind_result($link, $engine, "b", "LONGTEXT", "", 1680, $hint_str_or_unicode); + if (($IS_MYSQLND) || (!$IS_MYSQLND && (ini_get('memory_limit') > 4294967296))) { + /* NOTE: the MySQL Client Library - not mysqlnd - will allocate + a hugge max_length(type) = 4GB bind buffer */ + func_mysqli_stmt_bind_result($link, $engine, "b", "LONGBLOB", "", 1660); + func_mysqli_stmt_bind_result($link, $engine, "b", "LONGTEXT", "", 1680, $hint_str_or_unicode); + } func_mysqli_stmt_bind_result($link, $engine, "s", "ENUM('a', 'b')", "a", 1700, $hint_str_or_unicode); func_mysqli_stmt_bind_result($link, $engine, "s", "ENUM('a', 'b')", NULL, 1720, $hint_str_or_unicode); @@ -308,6 +312,10 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_bind_result(): invalid object or resource mysqli_stmt in %s on line %d diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt index 34f783189..1eef76747 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt @@ -25,11 +25,11 @@ require_once('skipifconnectfailure.inc'); return $bin; } - if (!$link_ins = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link_ins = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); - if (!$link_sel = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link_sel = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[002] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -151,5 +151,9 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link_sel); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- 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 ba8868697..dee5a7e0f 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt @@ -138,7 +138,7 @@ memory_limit=83886080 return true; } - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect - [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); @@ -329,5 +329,9 @@ memory_limit=83886080 mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt index 3040d316a..511f7e3e1 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt @@ -242,6 +242,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- plain vanilla... int(1) diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt index e5bd30484..56508533b 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt @@ -89,5 +89,9 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_close.phpt b/ext/mysqli/tests/mysqli_stmt_close.phpt index dbe86805a..b38f0cd68 100644 --- a/ext/mysqli/tests/mysqli_stmt_close.phpt +++ b/ext/mysqli/tests/mysqli_stmt_close.phpt @@ -79,6 +79,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_close(): invalid object or resource mysqli_stmt in %s on line %d diff --git a/ext/mysqli/tests/mysqli_stmt_data_seek.phpt b/ext/mysqli/tests/mysqli_stmt_data_seek.phpt index daabed8cd..246158e4c 100644 --- a/ext/mysqli/tests/mysqli_stmt_data_seek.phpt +++ b/ext/mysqli/tests/mysqli_stmt_data_seek.phpt @@ -81,6 +81,10 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_data_seek(): invalid object or resource mysqli_stmt in %s on line %d diff --git a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt index b5f8d5916..25c183a2a 100644 --- a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt +++ b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt @@ -9,14 +9,12 @@ require_once('skipifconnectfailure.inc'); --FILE-- <?php include "connect.inc"; - require('table.inc'); - - if (!$c1 = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + if (!$c1 = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { printf("Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); exit(1); } - if (!$c2 = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { + if (!$c2 = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { printf("Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); exit(1); @@ -25,7 +23,7 @@ require_once('skipifconnectfailure.inc'); $c1->query("use $db"); $c2->query("use $db"); $c1->query("drop table if exists type_change"); - $c1->query("create table type_change(a int, b char(10))"); + $c1->query("create table type_change(a int, b char(10)) ENGINE = " . $engine); $c1->query("insert into type_change values (1, 'one'), (2, 'two')"); $s1 = $c1->prepare("select a from type_change order by a"); var_dump($s1->execute(), $s1->bind_result($col1)); @@ -56,6 +54,18 @@ require_once('skipifconnectfailure.inc'); echo "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS type_change")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> + --EXPECTF-- bool(true) bool(true) diff --git a/ext/mysqli/tests/mysqli_stmt_errno.phpt b/ext/mysqli/tests/mysqli_stmt_errno.phpt index 16f9baaa5..59fde718d 100644 --- a/ext/mysqli/tests/mysqli_stmt_errno.phpt +++ b/ext/mysqli/tests/mysqli_stmt_errno.phpt @@ -59,6 +59,10 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_errno(): Couldn't fetch mysqli_stmt in %s on line %d done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_error.phpt b/ext/mysqli/tests/mysqli_stmt_error.phpt index 2c46e142b..ffb77fe0a 100644 --- a/ext/mysqli/tests/mysqli_stmt_error.phpt +++ b/ext/mysqli/tests/mysqli_stmt_error.phpt @@ -59,6 +59,10 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_error(): Couldn't fetch mysqli_stmt in %s on line %d done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_execute.phpt b/ext/mysqli/tests/mysqli_stmt_execute.phpt index f3c34c517..d1d62c206 100644 --- a/ext/mysqli/tests/mysqli_stmt_execute.phpt +++ b/ext/mysqli/tests/mysqli_stmt_execute.phpt @@ -126,6 +126,10 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_execute(): invalid object or resource mysqli_stmt in %s on line %d diff --git a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt index e4e57138f..afedea42d 100644 --- a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt +++ b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt @@ -5,7 +5,7 @@ mysqli_stmt_execute() - Stored Procedures require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); require_once('connect.inc'); -if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error())); } if (mysqli_get_server_version($link) <= 50000) { @@ -181,5 +181,18 @@ if (mysqli_get_server_version($link) <= 50000) { mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php +include "connect.inc"; +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + +if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +@mysqli_query($link, 'DROP PROCEDURE IF EXISTS p'); + +mysqli_close($link); +?> --EXPECTF-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_fetch.phpt b/ext/mysqli/tests/mysqli_stmt_fetch.phpt index ac0c07c94..6f7014831 100644 --- a/ext/mysqli/tests/mysqli_stmt_fetch.phpt +++ b/ext/mysqli/tests/mysqli_stmt_fetch.phpt @@ -85,6 +85,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_fetch(): invalid object or resource mysqli_stmt in %s on line %d diff --git a/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt b/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt index 0846599b3..2a2914ad8 100644 --- a/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt +++ b/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt @@ -18,11 +18,12 @@ Fetching BIT column values using the PS API <?php require('connect.inc'); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); - for ($bits = 1; $bits < 64; $bits++) { + /* NOTE: works only for up to 31 bits! This limitation should be documented. */ + for ($bits = 1; $bits < 32; $bits++) { $max_value = pow(2, $bits) - 1; $tests = 0; if (!mysqli_query($link, "DROP TABLE IF EXISTS test") || @@ -67,5 +68,9 @@ Fetching BIT column values using the PS API mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- -done! +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 d858c94da..e63591a10 100644 --- a/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt +++ b/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt @@ -46,6 +46,10 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- OK: 1 OK: 2 diff --git a/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt b/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt new file mode 100644 index 000000000..84998b942 --- /dev/null +++ b/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt @@ -0,0 +1,141 @@ +--TEST-- +mysqli_stmt_fetch - geometry / spatial types +--SKIPIF-- +<?php + require_once('skipif.inc'); + require_once('skipifemb.inc'); + require_once('skipifconnectfailure.inc'); + + if (!defined("MYSQLI_TYPE_GEOMETRY")) + die("skip MYSQLI_TYPE_GEOMETRY not defined"); +?> +--FILE-- +<?php + require('connect.inc'); + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + + function func_mysqli_stmt_fetch_geom($link, $engine, $sql_type, $bind_value, $offset) { + + if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) { + printf("[%04d] [%d] %s\n", $offset, mysqli_errno($link), mysqli_error($link)); + return false; + } + + if (!mysqli_query($link, sprintf("CREATE TABLE test(id INT, label %s, PRIMARY KEY(id)) ENGINE = %s", $sql_type, $engine))) { + // don't bail - column type might not be supported by the server, ignore this + return false; + } + + for ($id = 1; $id < 4; $id++) { + $sql = sprintf("INSERT INTO test(id, label) VALUES (%d, %s)", $id, $bind_value); + if (!mysqli_query($link, $sql)) { + printf("[%04d] [%d] %s\n", $offset + 2 + $id, mysqli_errno($link), mysqli_error($link)); + } + } + + if (!$stmt = mysqli_stmt_init($link)) { + printf("[%04d] [%d] %s\n", $offset + 6, mysqli_errno($link), mysqli_error($link)); + return false; + } + + if (!mysqli_stmt_prepare($stmt, "SELECT id, label FROM test")) { + printf("[%04d] [%d] %s\n", $offset + 7, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt)); + mysqli_stmt_close($stmt); + return false; + } + + if (!mysqli_stmt_execute($stmt) || !mysqli_stmt_store_result($stmt)) { + printf("[%04d] [%d] %s\n", $offset + 8, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt)); + mysqli_stmt_close($stmt); + return false; + } + + if (!mysqli_stmt_bind_result($stmt, $id, $bind_res)) { + printf("[%04d] [%d] %s\n", $offset + 9, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt)); + mysqli_stmt_close($stmt); + return false; + } + + $result = mysqli_stmt_result_metadata($stmt); + $fields = mysqli_fetch_fields($result); + if ($fields[1]->type != MYSQLI_TYPE_GEOMETRY) { + printf("[%04d] [%d] %s wrong type %d\n", $offset + 10, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt), $fields[1]->type); + } + + $num = 0; + $rows = array(); + while (true === @mysqli_stmt_fetch($stmt)) { + $rows[] = array('id' => $id, 'label' => $bind_res); + $num++; + } + + if ($num != 3) { + printf("[%04d] [%d] %s, expecting 3 results, got only %d results\n", + $offset + 17, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt), $num); + return false; + } + mysqli_stmt_close($stmt); + + foreach ($rows as $row) { + if (!$stmt = mysqli_stmt_init($link)) { + printf("[%04d] [%d] %s\n", $offset + 10, mysqli_errno($link), mysqli_error($link)); + return false; + } + + if (!mysqli_stmt_prepare($stmt, "INSERT INTO test(id, label) VALUES (?, ?)")) { + printf("[%04d] [%d] %s\n", $offset + 11, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt)); + return false; + } + + $new_id = $row['id'] + 10; + if (!mysqli_stmt_bind_param($stmt, "is", $new_id, $row['label'])) { + printf("[%04d] [%d] %s\n", $offset + 12, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt)); + return false; + } + + if (!mysqli_stmt_execute($stmt)) { + printf("[%04d] [%d] %s\n", $offset + 13, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt)); + return false; + } + mysqli_stmt_close($stmt); + + if (!$res_normal = mysqli_query($link, sprintf("SELECT id, label FROM test WHERE id = %d", + $new_id))) { + printf("[%04d] [%d] %s\n", $offset + 14, mysqli_errno($link), mysqli_error($link)); + return false; + } + + if (!$row_normal = mysqli_fetch_assoc($res_normal)) { + printf("[%04d] [%d] %s\n", $offset + 15, mysqli_errno($link), mysqli_error($link)); + return false; + } + + if ($row_normal['label'] != $row['label']) { + printf("[%04d] PS and non-PS return different data.\n", $offset + 16); + return false; + } + mysqli_free_result($res_normal); + } + + return true; + } + + func_mysqli_stmt_fetch_geom($link, $engine, "GEOMETRY", "GeomFromText('POINT(2 2)')", 20); + func_mysqli_stmt_fetch_geom($link, $engine, "POINT", "GeomFromText('POINT(1 1)')", 40); + func_mysqli_stmt_fetch_geom($link, $engine, "LINESTRING", "GeomFromText('LINESTRING(0 0,1 1,2 2)')", 60); + func_mysqli_stmt_fetch_geom($link, $engine, "POLYGON", "GeomFromText('POLYGON((0 0,10 0,10 10,0 10,0 0),(5 5,7 5,7 7,5 7, 5 5))')", 80); + func_mysqli_stmt_fetch_geom($link, $engine, "MULTIPOINT", "GeomFromText('MULTIPOINT(1 1, 2 2)')", 100); + func_mysqli_stmt_fetch_geom($link, $engine, "MULTILINESTRING", "GeomFromText('MULTILINESTRING((0 0,1 1,2 2),(0 0,1 1,3 3))')", 120); + func_mysqli_stmt_fetch_geom($link, $engine, "MULTIPOLYGON", "GeomFromText('MULTIPOLYGON(((0 0,10 0,10 10,0 10,0 0),(5 5,7 5,7 7,5 7, 5 5)),((0 0,10 0,10 10,0 10,0 0),(5 5,7 5,7 7,5 7, 5 5)))')", 140); + func_mysqli_stmt_fetch_geom($link, $engine, "GEOMETRYCOLLECTION", "GeomFromText('GEOMETRYCOLLECTION(POINT(1 1),LINESTRING(0 0,1 1,2 2,3 3,4 4))')", 160); + + mysqli_close($link); + print "done!"; +?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> +--EXPECTF-- +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_field_count.phpt b/ext/mysqli/tests/mysqli_stmt_field_count.phpt index 11c0e12e2..2dbf487ac 100644 --- a/ext/mysqli/tests/mysqli_stmt_field_count.phpt +++ b/ext/mysqli/tests/mysqli_stmt_field_count.phpt @@ -81,6 +81,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_field_count(): invalid object or resource mysqli_stmt in %s on line %d diff --git a/ext/mysqli/tests/mysqli_stmt_free_result.phpt b/ext/mysqli/tests/mysqli_stmt_free_result.phpt index db9defc63..12c1a34bc 100644 --- a/ext/mysqli/tests/mysqli_stmt_free_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_free_result.phpt @@ -74,6 +74,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_free_result(): invalid object or resource mysqli_stmt in %s on line %d diff --git a/ext/mysqli/tests/mysqli_stmt_get_result.phpt b/ext/mysqli/tests/mysqli_stmt_get_result.phpt index e58f6b000..58a7f0cde 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result.phpt @@ -155,6 +155,10 @@ if (!function_exists('mysqli_stmt_get_result')) print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_fetch(): invalid object or resource mysqli_stmt in %s on line %d diff --git a/ext/mysqli/tests/mysqli_stmt_get_result2.phpt b/ext/mysqli/tests/mysqli_stmt_get_result2.phpt index c56200873..1f493d2f1 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result2.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result2.phpt @@ -151,6 +151,10 @@ if (!function_exists('mysqli_stmt_get_result')) print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- array(2) { [%u|b%"id"]=> diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt index 27ca38909..6c476f7e9 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt @@ -37,7 +37,7 @@ Fetching BIT column values using the PS API return $bin; } - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -125,5 +125,9 @@ Fetching BIT column values using the PS API mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- 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 6a7131b92..dab805c1b 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt @@ -5,7 +5,7 @@ mysqli_stmt_get_result() - meta data, field_count() require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); - + if (!function_exists('mysqli_stmt_get_result')) die('skip mysqli_stmt_get_result not available'); ?> @@ -42,6 +42,10 @@ mysqli_stmt_get_result() - meta data, field_count() mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- 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 new file mode 100644 index 000000000..c86a385be --- /dev/null +++ b/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt @@ -0,0 +1,143 @@ +--TEST-- +mysqli_stmt_get_result - geometry / spatial types +--SKIPIF-- +<?php + require_once('skipif.inc'); + require_once('skipifemb.inc'); + require_once('skipifconnectfailure.inc'); + + if (!function_exists('mysqli_stmt_get_result')) + die("skip mysqli_stmt_get_result() not available"); + + if (!defined("MYSQLI_TYPE_GEOMETRY")) + die("skip MYSQLI_TYPE_GEOMETRY not defined"); +?> +--FILE-- +<?php + require('connect.inc'); + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); + + function func_mysqli_stmt_get_result_geom($link, $engine, $sql_type, $bind_value, $offset) { + + if (!mysqli_query($link, "DROP TABLE IF EXISTS test")) { + printf("[%04d] [%d] %s\n", $offset, mysqli_errno($link), mysqli_error($link)); + return false; + } + + if (!mysqli_query($link, sprintf("CREATE TABLE test(id INT, label %s, PRIMARY KEY(id)) ENGINE = %s", $sql_type, $engine))) { + // don't bail - column type might not be supported by the server, ignore this + return false; + } + + for ($id = 1; $id < 4; $id++) { + $sql = sprintf("INSERT INTO test(id, label) VALUES (%d, %s)", $id, $bind_value); + if (!mysqli_query($link, $sql)) { + printf("[%04d] [%d] %s\n", $offset + 2 + $id, mysqli_errno($link), mysqli_error($link)); + } + } + + if (!$stmt = mysqli_stmt_init($link)) { + printf("[%04d] [%d] %s\n", $offset + 6, mysqli_errno($link), mysqli_error($link)); + return false; + } + + if (!mysqli_stmt_prepare($stmt, "SELECT id, label FROM test")) { + printf("[%04d] [%d] %s\n", $offset + 7, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt)); + mysqli_stmt_close($stmt); + return false; + } + + if (!mysqli_stmt_execute($stmt)) { + printf("[%04d] [%d] %s\n", $offset + 8, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt)); + mysqli_stmt_close($stmt); + return false; + } + if (!$res = mysqli_stmt_get_result($stmt)) { + printf("[%04d] [%d] %s\n", $offset + 9, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt)); + mysqli_stmt_close($stmt); + return false; + } + + $result = mysqli_stmt_result_metadata($stmt); + $fields = mysqli_fetch_fields($result); + if ($fields[1]->type != MYSQLI_TYPE_GEOMETRY) { + printf("[%04d] [%d] %s wrong type %d\n", $offset + 10, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt), $fields[1]->type); + } + + $num = 0; + while ($row = mysqli_fetch_assoc($res)) { + $bind_res = &$row['label']; + + if (!$stmt2 = mysqli_stmt_init($link)) { + printf("[%04d] [%d] %s\n", $offset + 11, mysqli_errno($link), mysqli_error($link)); + return false; + } + + if (!mysqli_stmt_prepare($stmt2, "INSERT INTO test(id, label) VALUES (?, ?)")) { + printf("[%04d] [%d] %s\n", $offset + 12, mysqli_stmt_errno($stmt2), mysqli_stmt_error($stmt2)); + return false; + } + + $id = $row['id'] + 10; + if (!mysqli_stmt_bind_param($stmt2, "is", $id, $bind_res)) { + printf("[%04d] [%d] %s\n", $offset + 13, mysqli_stmt_errno($stmt2), mysqli_stmt_error($stmt2)); + return false; + } + + if (!mysqli_stmt_execute($stmt2)) { + printf("[%04d] [%d] %s\n", $offset + 14, mysqli_stmt_errno($stmt2), mysqli_stmt_error($stmt2)); + return false; + } + mysqli_stmt_close($stmt2); + + if (!$res_normal = mysqli_query($link, sprintf("SELECT id, label FROM test WHERE id = %d", + $row['id'] + 10))) { + printf("[%04d] [%d] %s\n", $offset + 15, mysqli_errno($link), mysqli_error($link)); + return false; + } + + if (!$row_normal = mysqli_fetch_assoc($res_normal)) { + printf("[%04d] [%d] %s\n", $offset + 16, mysqli_errno($link), mysqli_error($link)); + return false; + } + + if ($row_normal['label'] != $bind_res) { + printf("[%04d] PS and non-PS return different data.\n", $offset + 17); + return false; + } + mysqli_free_result($res_normal); + $num++; + } + + if ($num != 3) { + printf("[%04d] [%d] %s, expecting 3 results, got only %d results\n", + $offset + 18, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt), $num); + mysqli_free_result($res); + mysqli_stmt_close($stmt); + return false; + } + mysqli_free_result($res); + mysqli_stmt_close($stmt); + + return true; + } + + func_mysqli_stmt_get_result_geom($link, $engine, "GEOMETRY", "GeomFromText('POINT(2 2)')", 20); + func_mysqli_stmt_get_result_geom($link, $engine, "POINT", "GeomFromText('POINT(1 1)')", 40); + func_mysqli_stmt_get_result_geom($link, $engine, "LINESTRING", "GeomFromText('LINESTRING(0 0,1 1,2 2)')", 60); + func_mysqli_stmt_get_result_geom($link, $engine, "POLYGON", "GeomFromText('POLYGON((0 0,10 0,10 10,0 10,0 0),(5 5,7 5,7 7,5 7, 5 5))')", 80); + func_mysqli_stmt_get_result_geom($link, $engine, "MULTIPOINT", "GeomFromText('MULTIPOINT(1 1, 2 2)')", 100); + func_mysqli_stmt_get_result_geom($link, $engine, "MULTILINESTRING", "GeomFromText('MULTILINESTRING((0 0,1 1,2 2),(0 0,1 1,3 3))')", 120); + func_mysqli_stmt_get_result_geom($link, $engine, "MULTIPOLYGON", "GeomFromText('MULTIPOLYGON(((0 0,10 0,10 10,0 10,0 0),(5 5,7 5,7 7,5 7, 5 5)),((0 0,10 0,10 10,0 10,0 0),(5 5,7 5,7 7,5 7, 5 5)))')", 140); + func_mysqli_stmt_get_result_geom($link, $engine, "GEOMETRYCOLLECTION", "GeomFromText('GEOMETRYCOLLECTION(POINT(1 1),LINESTRING(0 0,1 1,2 2,3 3,4 4))')", 160); + + mysqli_close($link); + print "done!"; +?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> +--EXPECTF-- +done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt index bf13c1e2b..7fdabc001 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt @@ -206,6 +206,10 @@ if (!function_exists('mysqli_stmt_get_result')) print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- array(2) { [%u|b%"id"]=> diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt index 12489cef5..43ec10c4f 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt @@ -39,199 +39,105 @@ if (!function_exists('mysqli_stmt_get_result')) mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- object(stdClass)#%d (11) { - ["name"]=> - string(2) "id" - ["orgname"]=> - string(2) "id" - ["table"]=> - string(4) "test" - ["orgtable"]=> - string(4) "test" - ["def"]=> - string(0) "" - ["max_length"]=> + [%u|b%"name"]=> + %unicode|string%(2) "id" + [%u|b%"orgname"]=> + %unicode|string%(2) "id" + [%u|b%"table"]=> + %unicode|string%(4) "test" + [%u|b%"orgtable"]=> + %unicode|string%(4) "test" + [%u|b%"def"]=> + %unicode|string%(0) "" + [%u|b%"max_length"]=> int(0) - ["length"]=> + [%u|b%"length"]=> int(11) - ["charsetnr"]=> + [%u|b%"charsetnr"]=> int(63) - ["flags"]=> + [%u|b%"flags"]=> int(49155) - ["type"]=> + [%u|b%"type"]=> int(3) - ["decimals"]=> + [%u|b%"decimals"]=> int(0) } object(stdClass)#%d (11) { - ["name"]=> - string(5) "label" - ["orgname"]=> - string(5) "label" - ["table"]=> - string(4) "test" - ["orgtable"]=> - string(4) "test" - ["def"]=> - string(0) "" - ["max_length"]=> + [%u|b%"name"]=> + %unicode|string%(5) "label" + [%u|b%"orgname"]=> + %unicode|string%(5) "label" + [%u|b%"table"]=> + %unicode|string%(4) "test" + [%u|b%"orgtable"]=> + %unicode|string%(4) "test" + [%u|b%"def"]=> + %unicode|string%(0) "" + [%u|b%"max_length"]=> int(1) - ["length"]=> + [%u|b%"length"]=> int(1) - ["charsetnr"]=> + [%u|b%"charsetnr"]=> int(8) - ["flags"]=> + [%u|b%"flags"]=> int(0) - ["type"]=> + [%u|b%"type"]=> int(254) - ["decimals"]=> + [%u|b%"decimals"]=> int(0) } object(stdClass)#%d (11) { - ["name"]=> - string(3) "_id" - ["orgname"]=> - string(0) "" - ["table"]=> - string(0) "" - ["orgtable"]=> - string(0) "" - ["def"]=> - string(0) "" - ["max_length"]=> + [%u|b%"name"]=> + %unicode|string%(3) "_id" + [%u|b%"orgname"]=> + %unicode|string%(0) "" + [%u|b%"table"]=> + %unicode|string%(0) "" + [%u|b%"orgtable"]=> + %unicode|string%(0) "" + [%u|b%"def"]=> + %unicode|string%(0) "" + [%u|b%"max_length"]=> int(0) - ["length"]=> + [%u|b%"length"]=> int(%d) - ["charsetnr"]=> + [%u|b%"charsetnr"]=> int(63) - ["flags"]=> + [%u|b%"flags"]=> int(32897) - ["type"]=> + [%u|b%"type"]=> int(8) - ["decimals"]=> + [%u|b%"decimals"]=> int(0) } object(stdClass)#%d (11) { - ["name"]=> - string(8) "___label" - ["orgname"]=> - string(0) "" - ["table"]=> - string(0) "" - ["orgtable"]=> - string(0) "" - ["def"]=> - string(0) "" - ["max_length"]=> + [%u|b%"name"]=> + %unicode|string%(8) "___label" + [%u|b%"orgname"]=> + %unicode|string%(0) "" + [%u|b%"table"]=> + %unicode|string%(0) "" + [%u|b%"orgtable"]=> + %unicode|string%(0) "" + [%u|b%"def"]=> + %unicode|string%(0) "" + [%u|b%"max_length"]=> int(2) - ["length"]=> + [%u|b%"length"]=> int(2) - ["charsetnr"]=> + [%u|b%"charsetnr"]=> int(8) - ["flags"]=> - int(0) - ["type"]=> - int(253) - ["decimals"]=> - int(31) -} -done! ---UEXPECTF-- -object(stdClass)#%d (11) { - [u"name"]=> - unicode(2) "id" - [u"orgname"]=> - unicode(2) "id" - [u"table"]=> - unicode(4) "test" - [u"orgtable"]=> - unicode(4) "test" - [u"def"]=> - unicode(0) "" - [u"max_length"]=> - int(0) - [u"length"]=> - int(11) - [u"charsetnr"]=> - int(63) - [u"flags"]=> - int(49155) - [u"type"]=> - int(3) - [u"decimals"]=> - int(0) -} -object(stdClass)#%d (11) { - [u"name"]=> - unicode(5) "label" - [u"orgname"]=> - unicode(5) "label" - [u"table"]=> - unicode(4) "test" - [u"orgtable"]=> - unicode(4) "test" - [u"def"]=> - unicode(0) "" - [u"max_length"]=> - int(1) - [u"length"]=> - int(3) - [u"charsetnr"]=> - int(33) - [u"flags"]=> - int(0) - [u"type"]=> - int(254) - [u"decimals"]=> - int(0) -} -object(stdClass)#%d (11) { - [u"name"]=> - unicode(3) "_id" - [u"orgname"]=> - unicode(0) "" - [u"table"]=> - unicode(0) "" - [u"orgtable"]=> - unicode(0) "" - [u"def"]=> - unicode(0) "" - [u"max_length"]=> - int(0) - [u"length"]=> - int(%d) - [u"charsetnr"]=> - int(63) - [u"flags"]=> - int(32897) - [u"type"]=> - int(8) - [u"decimals"]=> - int(0) -} -object(stdClass)#%d (11) { - [u"name"]=> - unicode(8) "___label" - [u"orgname"]=> - unicode(0) "" - [u"table"]=> - unicode(0) "" - [u"orgtable"]=> - unicode(0) "" - [u"def"]=> - unicode(0) "" - [u"max_length"]=> - int(2) - [u"length"]=> - int(6) - [u"charsetnr"]=> - int(33) - [u"flags"]=> + [%u|b%"flags"]=> int(0) - [u"type"]=> + [%u|b%"type"]=> int(253) - [u"decimals"]=> + [%u|b%"decimals"]=> int(31) } 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 f08250292..717b39bd5 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt @@ -88,5 +88,9 @@ if (!function_exists('mysqli_stmt_get_result')) print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt index 54e4aeb60..c4312c603 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt @@ -114,6 +114,10 @@ if (!function_exists('mysqli_stmt_get_result')) print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_data_seek(): Couldn't fetch mysqli_result in %s on line %d diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt index 164326db4..724a32a78 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt @@ -12,7 +12,7 @@ mysqli_stmt_get_result - data types --FILE-- <?php require('connect.inc'); - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); $hint_str_or_unicode = (version_compare(PHP_VERSION, '5.9.9', '>') == 1) ? 'unicode' : 'string'; @@ -251,5 +251,9 @@ mysqli_stmt_get_result - data types mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt b/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt index 9f8f824b9..b8ca14eaf 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt @@ -79,6 +79,10 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_get_warnings(): invalid object or resource mysqli_stmt in %s on line %d diff --git a/ext/mysqli/tests/mysqli_stmt_init.phpt b/ext/mysqli/tests/mysqli_stmt_init.phpt index db5a21cd0..7d0154d24 100644 --- a/ext/mysqli/tests/mysqli_stmt_init.phpt +++ b/ext/mysqli/tests/mysqli_stmt_init.phpt @@ -44,6 +44,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_close(): invalid object or resource mysqli_stmt in %s on line %d diff --git a/ext/mysqli/tests/mysqli_stmt_insert_id.phpt b/ext/mysqli/tests/mysqli_stmt_insert_id.phpt index 1bfe19836..0347e66bd 100644 --- a/ext/mysqli/tests/mysqli_stmt_insert_id.phpt +++ b/ext/mysqli/tests/mysqli_stmt_insert_id.phpt @@ -67,6 +67,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_insert_id(): Couldn't fetch mysqli_stmt in %s on line %d NULL diff --git a/ext/mysqli/tests/mysqli_stmt_num_rows.phpt b/ext/mysqli/tests/mysqli_stmt_num_rows.phpt index 5cc83977d..4f3bc6142 100644 --- a/ext/mysqli/tests/mysqli_stmt_num_rows.phpt +++ b/ext/mysqli/tests/mysqli_stmt_num_rows.phpt @@ -97,6 +97,10 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- run_tests.php don't fool me with your 'ungreedy' expression '.+?'! diff --git a/ext/mysqli/tests/mysqli_stmt_param_count.phpt b/ext/mysqli/tests/mysqli_stmt_param_count.phpt index 92dfe6432..f55acfbbd 100644 --- a/ext/mysqli/tests/mysqli_stmt_param_count.phpt +++ b/ext/mysqli/tests/mysqli_stmt_param_count.phpt @@ -60,6 +60,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_param_count(): invalid object or resource mysqli_stmt in %s on line %d diff --git a/ext/mysqli/tests/mysqli_stmt_prepare.phpt b/ext/mysqli/tests/mysqli_stmt_prepare.phpt index 35879591e..115e1a52e 100644 --- a/ext/mysqli/tests/mysqli_stmt_prepare.phpt +++ b/ext/mysqli/tests/mysqli_stmt_prepare.phpt @@ -47,6 +47,10 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_prepare(): Couldn't fetch mysqli_stmt in %s on line %d done! diff --git a/ext/mysqli/tests/mysqli_stmt_reset.phpt b/ext/mysqli/tests/mysqli_stmt_reset.phpt index 903ba23eb..9f8864d28 100644 --- a/ext/mysqli/tests/mysqli_stmt_reset.phpt +++ b/ext/mysqli/tests/mysqli_stmt_reset.phpt @@ -99,6 +99,10 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_reset(): invalid object or resource mysqli_stmt in %s on line %d diff --git a/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt b/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt index 12235fc58..34d3bb201 100644 --- a/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt +++ b/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt @@ -93,6 +93,10 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_result_metadata(): invalid object or resource mysqli_stmt diff --git a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt index f6e509ae0..f0b775764 100644 --- a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt +++ b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt @@ -225,5 +225,9 @@ die("skip Check again when the Klingons visit earth - http://bugs.mysql.com/bug. mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt b/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt index d90248c71..4f173eff6 100644 --- a/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt +++ b/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt @@ -126,6 +126,10 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_send_long_data(): Invalid parameter number in %s on line %d 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 6c6936cb6..5bd40d84f 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 @@ -91,5 +91,9 @@ if (stristr(mysqli_get_client_info(), 'mysqlnd')) print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- 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 f641819c9..be8e59544 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 @@ -96,5 +96,9 @@ Warning: mysqli_stmt_send_long_data(): There was an error while sending long dat print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt b/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt index b946d31f2..b8a97cdef 100644 --- a/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt +++ b/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt @@ -51,6 +51,10 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_stmt_sqlstate(): invalid object or resource mysqli_stmt in %s on line %d diff --git a/ext/mysqli/tests/mysqli_stmt_store_result.phpt b/ext/mysqli/tests/mysqli_stmt_store_result.phpt index b74808bac..ee0bf83a8 100644 --- a/ext/mysqli/tests/mysqli_stmt_store_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_store_result.phpt @@ -42,7 +42,7 @@ require_once('skipifconnectfailure.inc'); !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)) + if (!$link_buf = my_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)) @@ -82,5 +82,9 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link_buf); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_stmt_unclonable.phpt b/ext/mysqli/tests/mysqli_stmt_unclonable.phpt index 5aa93b146..edddbea94 100644 --- a/ext/mysqli/tests/mysqli_stmt_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_stmt_unclonable.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); <?php include "connect.inc"; - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); diff --git a/ext/mysqli/tests/mysqli_store_result.phpt b/ext/mysqli/tests/mysqli_store_result.phpt index 13e2a1182..206cae309 100644 --- a/ext/mysqli/tests/mysqli_store_result.phpt +++ b/ext/mysqli/tests/mysqli_store_result.phpt @@ -55,6 +55,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_store_result(): Couldn't fetch mysqli in %s on line %d done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_thread_id.phpt b/ext/mysqli/tests/mysqli_thread_id.phpt index 673548944..a67060a1c 100644 --- a/ext/mysqli/tests/mysqli_thread_id.phpt +++ b/ext/mysqli/tests/mysqli_thread_id.phpt @@ -35,6 +35,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_thread_id(): Couldn't fetch mysqli in %s on line %d done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_unclonable.phpt b/ext/mysqli/tests/mysqli_unclonable.phpt index 73894f4f2..d21eafa79 100644 --- a/ext/mysqli/tests/mysqli_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_unclonable.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); <?php include "connect.inc"; - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); diff --git a/ext/mysqli/tests/mysqli_use_result.phpt b/ext/mysqli/tests/mysqli_use_result.phpt index 2f53aeae2..d1b09f104 100644 --- a/ext/mysqli/tests/mysqli_use_result.phpt +++ b/ext/mysqli/tests/mysqli_use_result.phpt @@ -55,6 +55,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_data_seek(): Function cannot be used with MYSQL_USE_RESULT in %s on line %d diff --git a/ext/mysqli/tests/mysqli_warning_count.phpt b/ext/mysqli/tests/mysqli_warning_count.phpt index c1663131b..0293fe869 100644 --- a/ext/mysqli/tests/mysqli_warning_count.phpt +++ b/ext/mysqli/tests/mysqli_warning_count.phpt @@ -43,6 +43,10 @@ require_once('skipifconnectfailure.inc'); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Warning: mysqli_warning_count(): Couldn't fetch mysqli in %s on line %d done!
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_warning_unclonable.phpt b/ext/mysqli/tests/mysqli_warning_unclonable.phpt index bdbc0e2f7..57d5de764 100644 --- a/ext/mysqli/tests/mysqli_warning_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_warning_unclonable.phpt @@ -13,7 +13,7 @@ if (!$TEST_EXPERIMENTAL) <?php include "connect.inc"; - if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) + if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -33,5 +33,9 @@ if (!$TEST_EXPERIMENTAL) $warning_clone = clone $warning; print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Fatal error: Trying to clone an uncloneable object of class mysqli_warning in %s on line %d
\ No newline at end of file diff --git a/ext/mysqli/tests/skipifconnectfailure.inc b/ext/mysqli/tests/skipifconnectfailure.inc index 68a62afe5..32a976357 100755 --- a/ext/mysqli/tests/skipifconnectfailure.inc +++ b/ext/mysqli/tests/skipifconnectfailure.inc @@ -2,7 +2,7 @@ require_once('connect.inc'); if ($skip_on_connect_failure) { include_once('connect.inc'); - $link = @mysqli_connect($host, $user, $passwd, $db, $port, $socket); + $link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); if (!is_object($link)) die(sprintf("skip Can't connect to MySQL Server - [%d] %s", mysqli_connect_errno(), mysqli_connect_error())); mysqli_close($link); diff --git a/ext/mysqli/tests/table.inc b/ext/mysqli/tests/table.inc index b36ba7b30..aa1207af4 100644 --- a/ext/mysqli/tests/table.inc +++ b/ext/mysqli/tests/table.inc @@ -1,7 +1,7 @@ <?PHP require_once('connect.inc'); -if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { +if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { printf("Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); exit(1); |