diff options
| author | Ulf Wendel <uw@php.net> | 2009-07-06 14:39:10 +0000 |
|---|---|---|
| committer | Ulf Wendel <uw@php.net> | 2009-07-06 14:39:10 +0000 |
| commit | f611876b2ed3141a28c152ba21d62d559388d6cd (patch) | |
| tree | 15a0da48950ce000e3066261368d1b3095c7c365 | |
| parent | fa382678335fe687ddf7d49c60ca9bbaaf898903 (diff) | |
| download | php-git-f611876b2ed3141a28c152ba21d62d559388d6cd.tar.gz | |
MFH. Adding --CLEAN-- sections to all ext/mysqli tests
216 files changed, 1407 insertions, 76 deletions
diff --git a/ext/mysqli/tests/002.phpt b/ext/mysqli/tests/002.phpt index c41a070bf4..680f0f4fc3 100644 --- a/ext/mysqli/tests/002.phpt +++ b/ext/mysqli/tests/002.phpt @@ -46,6 +46,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); 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_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 5a8d13c023..f780a248df 100644 --- a/ext/mysqli/tests/003.phpt +++ b/ext/mysqli/tests/003.phpt @@ -72,6 +72,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); 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_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 d4d318fc30..6f549de613 100644 --- a/ext/mysqli/tests/004.phpt +++ b/ext/mysqli/tests/004.phpt @@ -47,6 +47,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); 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_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 0ceabafaa6..69e04c7a60 100644 --- a/ext/mysqli/tests/005.phpt +++ b/ext/mysqli/tests/005.phpt @@ -37,6 +37,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); 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_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 b11760c6df..5b6ce14822 100644 --- a/ext/mysqli/tests/006.phpt +++ b/ext/mysqli/tests/006.phpt @@ -45,6 +45,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); 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_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 f0a144686e..a9a081106c 100644 --- a/ext/mysqli/tests/007.phpt +++ b/ext/mysqli/tests/007.phpt @@ -45,6 +45,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); 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_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 00ac730bad..fb63512aa7 100644 --- a/ext/mysqli/tests/008.phpt +++ b/ext/mysqli/tests/008.phpt @@ -45,6 +45,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); 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_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 4ed87950e6..479c5b5700 100644 --- a/ext/mysqli/tests/009.phpt +++ b/ext/mysqli/tests/009.phpt @@ -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 = 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 13752b1ab2..bb184eeb2a 100644 --- a/ext/mysqli/tests/010.phpt +++ b/ext/mysqli/tests/010.phpt @@ -48,6 +48,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); 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_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 ace0a88b98..5b58beb762 100644 --- a/ext/mysqli/tests/011.phpt +++ b/ext/mysqli/tests/011.phpt @@ -45,6 +45,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); 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_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 5f2e4d1ddb..9a9c985b26 100644 --- a/ext/mysqli/tests/012.phpt +++ b/ext/mysqli/tests/012.phpt @@ -44,6 +44,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); 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_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 fc8211b2b6..1d41e5668b 100644 --- a/ext/mysqli/tests/013.phpt +++ b/ext/mysqli/tests/013.phpt @@ -56,6 +56,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); 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_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 eb2b7322e9..a7bbaa7ded 100644 --- a/ext/mysqli/tests/014.phpt +++ b/ext/mysqli/tests/014.phpt @@ -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 8eaddfc846..722a16a429 100644 --- a/ext/mysqli/tests/015.phpt +++ b/ext/mysqli/tests/015.phpt @@ -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/019.phpt b/ext/mysqli/tests/019.phpt index 30a55aa3c0..d603320099 100644 --- a/ext/mysqli/tests/019.phpt +++ b/ext/mysqli/tests/019.phpt @@ -55,6 +55,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); 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 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 9035cceb9f..159cdf51ec 100644 --- a/ext/mysqli/tests/020.phpt +++ b/ext/mysqli/tests/020.phpt @@ -67,6 +67,17 @@ require_once('skipifconnectfailure.inc'); 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_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 28e2800a01..d4f246374d 100644 --- a/ext/mysqli/tests/021.phpt +++ b/ext/mysqli/tests/021.phpt @@ -38,6 +38,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); 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_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 36fdd7cee4..378a4ac490 100644 --- a/ext/mysqli/tests/022.phpt +++ b/ext/mysqli/tests/022.phpt @@ -43,6 +43,17 @@ require_once('skipifconnectfailure.inc'); 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_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 4613a2c471..be0540dec5 100644 --- a/ext/mysqli/tests/023.phpt +++ b/ext/mysqli/tests/023.phpt @@ -52,6 +52,17 @@ require_once('skipifconnectfailure.inc'); 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_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 e5bcdaf47f..0d96cffcc0 100644 --- a/ext/mysqli/tests/024.phpt +++ b/ext/mysqli/tests/024.phpt @@ -52,6 +52,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); 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_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 8f419ae35c..4aa34a2fed 100644 --- a/ext/mysqli/tests/025.phpt +++ b/ext/mysqli/tests/025.phpt @@ -57,6 +57,17 @@ require_once('skipifconnectfailure.inc'); 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_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 597a16d129..dd92c7bea3 100644 --- a/ext/mysqli/tests/026.phpt +++ b/ext/mysqli/tests/026.phpt @@ -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 = 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/029.phpt b/ext/mysqli/tests/029.phpt index b282e7c2ee..9ec3bae362 100644 --- a/ext/mysqli/tests/029.phpt +++ b/ext/mysqli/tests/029.phpt @@ -14,7 +14,7 @@ require_once('skipifconnectfailure.inc'); 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 = 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/032.phpt b/ext/mysqli/tests/032.phpt index e6e03477f9..b3ca26474b 100644 --- a/ext/mysqli/tests/032.phpt +++ b/ext/mysqli/tests/032.phpt @@ -26,6 +26,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); 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 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/036.phpt b/ext/mysqli/tests/036.phpt index 45b5fda5a8..a118cdf463 100644 --- a/ext/mysqli/tests/036.phpt +++ b/ext/mysqli/tests/036.phpt @@ -42,6 +42,17 @@ function test: mysqli_insert_id() mysqli_close($link); 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 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 cb721e08a6..29a01c6d39 100644 --- a/ext/mysqli/tests/037.phpt +++ b/ext/mysqli/tests/037.phpt @@ -32,6 +32,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); 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_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 bc3c544191..7d9c2b3485 100644 --- a/ext/mysqli/tests/038.phpt +++ b/ext/mysqli/tests/038.phpt @@ -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 = 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/040.phpt b/ext/mysqli/tests/040.phpt index 675d345188..da787ab687 100644 --- a/ext/mysqli/tests/040.phpt +++ b/ext/mysqli/tests/040.phpt @@ -31,6 +31,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); 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_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 81bd808c4b..329e5d5072 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-- @@ -22,6 +22,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); 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_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 401006b399..7c0556a634 100644 --- a/ext/mysqli/tests/042.phpt +++ b/ext/mysqli/tests/042.phpt @@ -48,6 +48,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); 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_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 0cf3e37498..f2be1c8d7b 100644 --- a/ext/mysqli/tests/043.phpt +++ b/ext/mysqli/tests/043.phpt @@ -40,6 +40,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); 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_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/046.phpt b/ext/mysqli/tests/046.phpt index a08a9349ed..8e8991a40d 100644 --- a/ext/mysqli/tests/046.phpt +++ b/ext/mysqli/tests/046.phpt @@ -34,6 +34,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); 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_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 172f2ef1de..4c90b113b8 100644 --- a/ext/mysqli/tests/047.phpt +++ b/ext/mysqli/tests/047.phpt @@ -45,6 +45,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); 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_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 a63b0a3a92..c8ec77ecb3 100644 --- a/ext/mysqli/tests/048.phpt +++ b/ext/mysqli/tests/048.phpt @@ -40,6 +40,17 @@ require_once('skipifconnectfailure.inc'); $mysql->close(); 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_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/057.phpt b/ext/mysqli/tests/057.phpt index d4203b44fa..a98ff46cb5 100644 --- a/ext/mysqli/tests/057.phpt +++ b/ext/mysqli/tests/057.phpt @@ -62,6 +62,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); echo "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_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 ae8b69b798..288d086342 100644 --- a/ext/mysqli/tests/058.phpt +++ b/ext/mysqli/tests/058.phpt @@ -48,6 +48,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); 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 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 8eadbd9e8a..1b42848d78 100644 --- a/ext/mysqli/tests/059.phpt +++ b/ext/mysqli/tests/059.phpt @@ -41,6 +41,17 @@ require_once('skipifconnectfailure.inc'); mysqli_close($link); 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 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 0162873c84..cd574d3321 100644 --- a/ext/mysqli/tests/060.phpt +++ b/ext/mysqli/tests/060.phpt @@ -42,6 +42,17 @@ require_once('skipifconnectfailure.inc'); echo "Done\n"; ?> +--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_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 03b3d84f3a..b0812fa422 100644 --- a/ext/mysqli/tests/061.phpt +++ b/ext/mysqli/tests/061.phpt @@ -49,6 +49,17 @@ if (!function_exists('mysqli_set_local_infile_handler')) unlink($filename); 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 t_061")) + printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + +mysqli_close($link); +?> --EXPECT-- foo-bar %unicode|string%-%unicode|string% diff --git a/ext/mysqli/tests/066.phpt b/ext/mysqli/tests/066.phpt index bdf253b7b0..e22fc7d215 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-- @@ -28,6 +28,17 @@ require_once('skipifconnectfailure.inc'); $mysql->close(); 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_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 da372607cb..fa1cee9d71 100644 --- a/ext/mysqli/tests/067.phpt +++ b/ext/mysqli/tests/067.phpt @@ -64,5 +64,18 @@ function test: nested selects (cursors) $mysql->close(); var_dump($cnt); ?> +--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()); + +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/bug32405.phpt b/ext/mysqli/tests/bug32405.phpt index 7754f60a99..a6e4d19a8d 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-- @@ -13,7 +13,7 @@ require_once('skipifconnectfailure.inc'); $link = 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 = 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/bug34810.phpt b/ext/mysqli/tests/bug34810.phpt index ed98e1e5a1..e1a6ca30c9 100644 --- a/ext/mysqli/tests/bug34810.phpt +++ b/ext/mysqli/tests/bug34810.phpt @@ -33,6 +33,17 @@ $db->connect(); echo "Done\n"; ?> +--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_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 b94366203a..f307b2002a 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-- @@ -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 = 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 fb7f9d19c6..9a77032996 100644 --- a/ext/mysqli/tests/bug35517.phpt +++ b/ext/mysqli/tests/bug35517.phpt @@ -37,6 +37,17 @@ require_once('skipifconnectfailure.inc'); $mysql->close(); 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 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 ca8622d3a8..3850b44f18 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 = 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/bug36745.phpt b/ext/mysqli/tests/bug36745.phpt index eef65d8aae..c1f2a11ab5 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-- @@ -21,6 +21,17 @@ require_once('skipifconnectfailure.inc'); $mysql->close(); printf("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 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/bug36949.phpt b/ext/mysqli/tests/bug36949.phpt index 9362d7ff3a..10aaad5ccd 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 = 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 003ace9d11..d74f57b767 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"); } ?> diff --git a/ext/mysqli/tests/bug42378.phpt b/ext/mysqli/tests/bug42378.phpt index fcdd7e0daa..1667eb47d0 100644 --- a/ext/mysqli/tests/bug42378.phpt +++ b/ext/mysqli/tests/bug42378.phpt @@ -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 64c2ba31ec..418de89d9a 100644 --- a/ext/mysqli/tests/bug42548.phpt +++ b/ext/mysqli/tests/bug42548.phpt @@ -50,6 +50,16 @@ $mysqli->query("DROP PROCEDURE p1") or die($mysqli->error); $mysqli->close(); 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()); + +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 058468c10b..22849aa5d1 100644 --- a/ext/mysqli/tests/bug44897.phpt +++ b/ext/mysqli/tests/bug44897.phpt @@ -72,5 +72,19 @@ if (mysqli_get_server_version($link) <= 50000) { 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_close($link); +?> + --EXPECTF-- done! diff --git a/ext/mysqli/tests/bug45289.phpt b/ext/mysqli/tests/bug45289.phpt index 2c6bbe9745..17d1a3b446 100644 --- a/ext/mysqli/tests/bug45289.phpt +++ b/ext/mysqli/tests/bug45289.phpt @@ -25,6 +25,10 @@ require_once('skipifconnectfailure.inc'); var_dump($res->fetch_assoc()); ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- [003] [0%s diff --git a/ext/mysqli/tests/clean_table.inc b/ext/mysqli/tests/clean_table.inc new file mode 100644 index 0000000000..8ea74aecdf --- /dev/null +++ b/ext/mysqli/tests/clean_table.inc @@ -0,0 +1,14 @@ +<?PHP +require_once('connect.inc'); + +if (!$link = 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/mysqli_affected_rows.phpt b/ext/mysqli/tests/mysqli_affected_rows.phpt index 24762cc99a..a09ed22742 100644 --- a/ext/mysqli/tests/mysqli_affected_rows.phpt +++ b/ext/mysqli/tests/mysqli_affected_rows.phpt @@ -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 bdbb790b13..9fbce3eb01 100644 --- a/ext/mysqli/tests/mysqli_affected_rows_oo.phpt +++ b/ext/mysqli/tests/mysqli_affected_rows_oo.phpt @@ -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 f409baadc0..d94e0dbbe3 100644 --- a/ext/mysqli/tests/mysqli_autocommit.phpt +++ b/ext/mysqli/tests/mysqli_autocommit.phpt @@ -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 006a5d4bab..a0c5f1f8d4 100644 --- a/ext/mysqli/tests/mysqli_autocommit_oo.phpt +++ b/ext/mysqli/tests/mysqli_autocommit_oo.phpt @@ -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_get_lock.phpt b/ext/mysqli/tests/mysqli_change_user_get_lock.phpt index 437e39304f..8ca387ab39 100644 --- a/ext/mysqli/tests/mysqli_change_user_get_lock.phpt +++ b/ext/mysqli/tests/mysqli_change_user_get_lock.phpt @@ -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 bbdfc578b7..b3235092a0 100644 --- a/ext/mysqli/tests/mysqli_change_user_insert_id.phpt +++ b/ext/mysqli/tests/mysqli_change_user_insert_id.phpt @@ -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 43fa433d09..515a2107aa 100644 --- a/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt +++ b/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt @@ -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_rollback.phpt b/ext/mysqli/tests/mysqli_change_user_rollback.phpt index ae1d91180e..600c7af7e1 100644 --- a/ext/mysqli/tests/mysqli_change_user_rollback.phpt +++ b/ext/mysqli/tests/mysqli_change_user_rollback.phpt @@ -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_character_set.phpt b/ext/mysqli/tests/mysqli_character_set.phpt index 4823f51d56..e6e1037a9c 100644 --- a/ext/mysqli/tests/mysqli_character_set.phpt +++ b/ext/mysqli/tests/mysqli_character_set.phpt @@ -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_class_mysqli_warning.phpt b/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt index 0d1d3a0172..c1d6687181 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt @@ -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_commit.phpt b/ext/mysqli/tests/mysqli_commit.phpt index e19e63564c..1aecd16e48 100644 --- a/ext/mysqli/tests/mysqli_commit.phpt +++ b/ext/mysqli/tests/mysqli_commit.phpt @@ -1,9 +1,9 @@ --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)) { @@ -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 7323db78f0..d302e38cee 100644 --- a/ext/mysqli/tests/mysqli_commit_oo.phpt +++ b/ext/mysqli/tests/mysqli_commit_oo.phpt @@ -1,9 +1,9 @@ --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)) { die(sprintf("skip Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", @@ -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_data_seek.phpt b/ext/mysqli/tests/mysqli_data_seek.phpt index d25347ade0..cb54c80033 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 40fabe1ce9..e75a04f36e 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 da41894b11..2b754eac36 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 671b3821e2..f15365f2ec 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_mysqlnd_control_string.phpt b/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt index db9ceb3823..9b43e15bdf 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 fc9f7a8022..8ecf516cad 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 80a37f8f93..d918cc4030 100644 --- a/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt +++ b/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt @@ -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_errno.phpt b/ext/mysqli/tests/mysqli_errno.phpt index c57b037262..786a716e35 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'); ?> diff --git a/ext/mysqli/tests/mysqli_errno_oo.phpt b/ext/mysqli/tests/mysqli_errno_oo.phpt index 09f7d6ed32..032f70a878 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_explain_metadata.phpt b/ext/mysqli/tests/mysqli_explain_metadata.phpt index a8cc59d7cf..5bfb001a18 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 0a8a7dec2c..26401e7cce 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 e891f08d56..9d3032cbb9 100644 --- a/ext/mysqli/tests/mysqli_fetch_all_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_all_oo.phpt @@ -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 99d573200d..d85eb9e6ff 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_many_rows.phpt b/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt index 6c8e58a88a..c9ed7ccac7 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 e7e7d12d85..e8b2618f70 100644 --- a/ext/mysqli/tests/mysqli_fetch_array_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array_oo.phpt @@ -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 6ea05caf64..6aaed3eb1f 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 dc01154daa..9bbc802c23 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt @@ -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 3ba0218a3a..5106bb7e84 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt @@ -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 35bbfb7ba5..ce7e82dc08 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 57952967fa..dba9f2f557 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 2eb7cd28d1..5b4dc56711 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 a8ad58e00d..81328e621b 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt @@ -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 9c74408c20..6c0a9a51e0 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt @@ -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 d7e255b83a..2c169ed3f0 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 fa9825354c..ae18f0ca63 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 de21d2cd63..0acec5477c 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 054bfcb29f..71c2349224 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 3689c69fc4..d5422dccac 100644 --- a/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt @@ -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 39cfd0518f..f164c4e19b 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 9fc795a109..fc7efe4b2d 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 a9173d093e..c76742226d 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 fe3434cf63..552c24b11d 100644 --- a/ext/mysqli/tests/mysqli_fetch_object_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt @@ -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 6723fdb656..bb44fd4189 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 be8c3075d6..5c63b86f67 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 2074719747..9d17f1a757 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 81626346ac..9609a7c5df 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 d5d8ad11f6..56df324251 100644 --- a/ext/mysqli/tests/mysqli_fork.phpt +++ b/ext/mysqli/tests/mysqli_fork.phpt @@ -234,6 +234,20 @@ if ($row[1] == "DISABLED" || $row[1] == "NO") { 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)); + +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 32f57078df..1454353583 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 745787f7ff..d49e399bbf 100644 --- a/ext/mysqli/tests/mysqli_get_cache_stats.phpt +++ b/ext/mysqli/tests/mysqli_get_cache_stats.phpt @@ -92,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 50369a3723..0bb90fa714 100644 --- a/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt +++ b/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt @@ -91,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 index 0ec64f777b..8f9fcc7f2d 100644 --- a/ext/mysqli/tests/mysqli_get_cache_stats_off.phpt +++ b/ext/mysqli/tests/mysqli_get_cache_stats_off.phpt @@ -51,5 +51,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_charset.phpt b/ext/mysqli/tests/mysqli_get_charset.phpt index 128e07f820..314853dc02 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 dd1ccfdead..26a1e76c73 100644 --- a/ext/mysqli/tests/mysqli_get_client_stats.phpt +++ b/ext/mysqli/tests/mysqli_get_client_stats.phpt @@ -858,6 +858,32 @@ mysqlnd.collect_memory_statistics=1 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)); + +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) { [%u|b%"bytes_sent"]=> 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 6d835abd8b..880ee321f0 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 9594eb526f..e2dff9befb 100644 --- a/ext/mysqli/tests/mysqli_get_client_stats_off.phpt +++ b/ext/mysqli/tests/mysqli_get_client_stats_off.phpt @@ -40,5 +40,9 @@ mysqlnd.collect_memory_statistics=0 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 fea641b816..d12957b113 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_connection_stats.phpt b/ext/mysqli/tests/mysqli_get_connection_stats.phpt index ede0b3b41d..8c2926a0b8 100644 --- a/ext/mysqli/tests/mysqli_get_connection_stats.phpt +++ b/ext/mysqli/tests/mysqli_get_connection_stats.phpt @@ -65,5 +65,9 @@ if (!function_exists('mysqli_get_connection_stats')) { print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- done! diff --git a/ext/mysqli/tests/mysqli_get_host_info.phpt b/ext/mysqli/tests/mysqli_get_host_info.phpt index f76cc70022..63fdad28b4 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 69dfe8763d..f10cc4cfa9 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 2583bf94b6..661018be76 100644 --- a/ext/mysqli/tests/mysqli_get_warnings.phpt +++ b/ext/mysqli/tests/mysqli_get_warnings.phpt @@ -143,5 +143,18 @@ if (!$TEST_EXPERIMENTAL) print "done!"; ?> +<?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)); + +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 8760f21777..5094b9a8d3 100644 --- a/ext/mysqli/tests/mysqli_info.phpt +++ b/ext/mysqli/tests/mysqli_info.phpt @@ -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 3984326722..a5491bf973 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 94f9964758..ec5060f4f6 100644 --- a/ext/mysqli/tests/mysqli_insert_id_variation.phpt +++ b/ext/mysqli/tests/mysqli_insert_id_variation.phpt @@ -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 = 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 0d79f8f88f..661c12dcac 100644 --- a/ext/mysqli/tests/mysqli_kill.phpt +++ b/ext/mysqli/tests/mysqli_kill.phpt @@ -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 a9a7980229..bf74381788 100644 --- a/ext/mysqli/tests/mysqli_max_links.phpt +++ b/ext/mysqli/tests/mysqli_max_links.phpt @@ -36,6 +36,10 @@ mysqli.max_links=1 mysqli_close($link); print "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- bool(true) int(1) diff --git a/ext/mysqli/tests/mysqli_more_results.phpt b/ext/mysqli/tests/mysqli_more_results.phpt index 1f12168841..49de0d7fad 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 f28479bb40..dd26fd71ba 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 5bd78a9c15..29ff65780c 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_next_result.phpt b/ext/mysqli/tests/mysqli_next_result.phpt index 118b8677c8..0dc49c72f0 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_num_fields.phpt b/ext/mysqli/tests/mysqli_num_fields.phpt index fc99ecf9e5..88825573c1 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 70af3c4043..f1798cc2c8 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_pconn_kill.phpt b/ext/mysqli/tests/mysqli_pconn_kill.phpt index d25d5321bc..01c37e309a 100755 --- a/ext/mysqli/tests/mysqli_pconn_kill.phpt +++ b/ext/mysqli/tests/mysqli_pconn_kill.phpt @@ -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 9f8bfe7d78..13beb69fbf 100644 --- a/ext/mysqli/tests/mysqli_pconn_limits.phpt +++ b/ext/mysqli/tests/mysqli_pconn_limits.phpt @@ -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 ceac644897..a6cb0ed8d5 100644 --- a/ext/mysqli/tests/mysqli_pconn_max_links.phpt +++ b/ext/mysqli/tests/mysqli_pconn_max_links.phpt @@ -15,9 +15,10 @@ Persistent connections and mysqli.max_links 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 = @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"); @@ -158,6 +158,22 @@ mysqli.max_persistent=2 mysqli_close($link); 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, '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"]=> diff --git a/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt b/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt index 443259887b..d95a7b41ba 100644 --- a/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt +++ b/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt @@ -153,6 +153,23 @@ if (!$IS_MYSQLND) 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)); + +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_prepare.phpt b/ext/mysqli/tests/mysqli_prepare.phpt index 8c1d8bbd02..162ca86b43 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 = 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 de62b57391..33961d4086 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-- @@ -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_query.phpt b/ext/mysqli/tests/mysqli_query.phpt index 12cba90dfa..973a447e13 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 = 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 index e141d3e230..723013f552 100644 --- a/ext/mysqli/tests/mysqli_query_local_infile_large.phpt +++ b/ext/mysqli/tests/mysqli_query_local_infile_large.phpt @@ -71,7 +71,7 @@ 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("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); + printf("[c002] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); ?> --EXPECTF-- Filesize in bytes: %d diff --git a/ext/mysqli/tests/mysqli_query_stored_proc.phpt b/ext/mysqli/tests/mysqli_query_stored_proc.phpt index f419205eaa..1dda1dc205 100644 --- a/ext/mysqli/tests/mysqli_query_stored_proc.phpt +++ b/ext/mysqli/tests/mysqli_query_stored_proc.phpt @@ -150,6 +150,19 @@ END;')) { mysqli_close($link); 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 IS EXISTS p"); + +mysqli_close($link); +?> --EXPECTF-- array(2) { [%u|b%"id"]=> diff --git a/ext/mysqli/tests/mysqli_real_connect.phpt b/ext/mysqli/tests/mysqli_real_connect.phpt index 8f20c7edd3..effae2bc24 100644 --- a/ext/mysqli/tests/mysqli_real_connect.phpt +++ b/ext/mysqli/tests/mysqli_real_connect.phpt @@ -170,6 +170,10 @@ require_once('skipifconnectfailure.inc'); 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) { diff --git a/ext/mysqli/tests/mysqli_real_connect_pconn.phpt b/ext/mysqli/tests/mysqli_real_connect_pconn.phpt index ad9645177c..5dedd47c96 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 92961977f3..8e30344159 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_report.phpt b/ext/mysqli/tests/mysqli_report.phpt index 7b421014df..525921f4c3 100644 --- a/ext/mysqli/tests/mysqli_report.phpt +++ b/ext/mysqli/tests/mysqli_report.phpt @@ -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 58aae0af1f..f4b8fd9c17 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-- @@ -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 fab24a7f9a..ea1f276b1a 100644 --- a/ext/mysqli/tests/mysqli_result_references.phpt +++ b/ext/mysqli/tests/mysqli_result_references.phpt @@ -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_rollback.phpt b/ext/mysqli/tests/mysqli_rollback.phpt index fef4cbb321..cadf92c107 100644 --- a/ext/mysqli/tests/mysqli_rollback.phpt +++ b/ext/mysqli/tests/mysqli_rollback.phpt @@ -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_set_charset.phpt b/ext/mysqli/tests/mysqli_set_charset.phpt index e10b3348b7..27ec10f209 100644 --- a/ext/mysqli/tests/mysqli_set_charset.phpt +++ b/ext/mysqli/tests/mysqli_set_charset.phpt @@ -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 167fc0f80d..dd67bb32a3 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 b876389f18..929587dafa 100644 --- a/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt +++ b/ext/mysqli/tests/mysqli_set_local_infile_handler.phpt @@ -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 2ea5ceb0c3..9e69ce4f57 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 @@ -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 6c557201bd..bcc60d7721 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 @@ -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 d9335813be..8f06630e5c 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 @@ -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 4bdb54b1cb..71d768f290 100644 --- a/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt +++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt @@ -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 3bdf6bb78b..1732a1c9d1 100755 --- a/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt +++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_closures.phpt @@ -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 efb72d2859..1aa2878dd3 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 @@ -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 3b8813aeb7..eb39a91735 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 @@ -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 50be4a5937..d822e0a52b 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 @@ -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 2858e40346..464519d0f8 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 @@ -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 c92f93762b..3912f52788 100644 --- a/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt +++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_nofileop.phpt @@ -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 a4f20cb75e..1d75d5ae82 100644 --- a/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt +++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_openbasedir.phpt @@ -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 22f89fd053..caee2be429 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 @@ -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 78f2fced19..7d781d6c9e 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 @@ -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 4a321bf30e..38b3c00bef 100644 --- a/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt +++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_unregister.phpt @@ -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_numeric_and_datetime_as_unicode.phpt b/ext/mysqli/tests/mysqli_set_opt_numeric_and_datetime_as_unicode.phpt index 269e7dcf39..77047a19cb 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 cdf0b5eecf..0ed39f4ee5 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_stmt_affected_rows.phpt b/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt index 7059608ccf..07d565dafe 100644 --- a/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt +++ b/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt @@ -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 6156936f34..abedf56b21 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 cb7d507eb8..26bbf9649c 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 c5d88bf277..810f19fdaa 100644 --- a/ext/mysqli/tests/mysqli_stmt_attr_set.phpt +++ b/ext/mysqli/tests/mysqli_stmt_attr_set.phpt @@ -259,5 +259,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.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param.phpt index 0b39a1b6d6..9aaac98040 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 8fc9380b3f..8f4a989bbf 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 12d76e8d85..a7d36743c0 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 @@ -62,6 +62,10 @@ require_once('skipifconnectfailure.inc'); echo("$one - $two\n\n"); echo "done!"; ?> +--CLEAN-- +<?php + require_once("clean_table.inc"); +?> --EXPECTF-- Test 1: object(foo)#%d (1) { diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt index 8ca45691e5..07a0ff34d6 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt @@ -199,5 +199,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 4e03c66f2a..ab871ce95a 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 a1b0e2caab..00750ee7d4 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result.phpt @@ -308,6 +308,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 34f7831896..bb8e87ffb5 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt @@ -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 ba88686971..6fcbcd31b1 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result_format.phpt @@ -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 3040d316a7..511f7e3e19 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 e5bd304848..56508533ba 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 dbe86805ae..b38f0cd684 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 daabed8cd2..246158e4cb 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 b5f8d59160..3418f68e03 100644 --- a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt +++ b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt @@ -9,8 +9,6 @@ require_once('skipifconnectfailure.inc'); --FILE-- <?php include "connect.inc"; - require('table.inc'); - if (!$c1 = 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); @@ -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 = 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 16f9baaa5c..59fde718da 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 2c46e142b8..ffb77fe0a5 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 f3c34c517c..d1d62c206f 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 e4e57138f3..19c228d210 100644 --- a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt +++ b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt @@ -181,5 +181,18 @@ if (mysqli_get_server_version($link) <= 50000) { mysqli_close($link); 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_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 ac0c07c940..6f7014831f 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 0846599b3e..980deee2b1 100644 --- a/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt +++ b/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt @@ -67,5 +67,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 d858c94da0..e63591a108 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_field_count.phpt b/ext/mysqli/tests/mysqli_stmt_field_count.phpt index 11c0e12e2a..2dbf487ac3 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 db9defc637..12c1a34bcb 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 e58f6b0001..58a7f0cde0 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 c562008731..1f493d2f11 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 27ca389093..b4bb34a675 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt @@ -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 6a7131b926..dab805c1b5 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_metadata.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt index bf13c1e2b2..7fdabc001c 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 2e323ee1f6..43ec10c4f8 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,6 +39,10 @@ if (!function_exists('mysqli_stmt_get_result')) 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_stmt_get_result_non_select.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt index f08250292f..717b39bd5b 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 54e4aeb609..c4312c603d 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 164326db4c..50bcf6503f 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt @@ -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 9f8f824b95..b8ca14eaff 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 db5a21cd01..7d0154d24c 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 1bfe19836b..0347e66bd5 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 5cc83977d0..4f3bc61428 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 92dfe64321..f55acfbbdb 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 35879591ef..115e1a52e6 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 903ba23eb0..9f8864d286 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 12235fc58a..34d3bb2015 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 f6e509ae02..f0b7757649 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 d90248c716..4f173eff68 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 6c6936cb65..5bd40d84f4 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 f641819c9c..be8e59544b 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 b946d31f20..b8a97cdef8 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 b74808bac8..4802a98ff6 100644 --- a/ext/mysqli/tests/mysqli_stmt_store_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_store_result.phpt @@ -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_store_result.phpt b/ext/mysqli/tests/mysqli_store_result.phpt index 13e2a1182a..206cae3095 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 6735489444..a67060a1c4 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_use_result.phpt b/ext/mysqli/tests/mysqli_use_result.phpt index 2f53aeae2a..d1b09f1043 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 c1663131b5..0293fe8696 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 bdbc0e2f70..9bdd246194 100644 --- a/ext/mysqli/tests/mysqli_warning_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_warning_unclonable.phpt @@ -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 |