MFH. Adding --CLEAN-- sections to all ext/mysqli tests

diff --git a/ext/mysqli/tests/002.phpt b/ext/mysqli/tests/002.phpt
index c41a070bf463699e27aca9e54e8d9e68bae20b86..680f0f4fc306607f24b9acf15392e9eb787369bf 100644 (file)
--- 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 5a8d13c0234011f915ff1f9de355778bcdca0b02..f780a248df39c7cedf157161ba6f086b20fb8562 100644 (file)
--- 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 d4d318fc301510f660547d015e9ca565d60a349a..6f549de613cc247440c12b4db713f4208e0eb0f6 100644 (file)
--- 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 0ceabafaa6d83687d43c69df8419bbb2cf81fdd4..69e04c7a6044fec68b752e0bb430d338c7a9b060 100644 (file)
--- 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 b11760c6dffcede2d289b15b76bed8594e94ffc5..5b6ce14822d4c386f691a39813c44a9ce0625b57 100644 (file)
--- 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 f0a144686e7be636a7a640e3b90d3355bfc33ece..a9a081106ca888ebb3c6d8310b9eae1051f9e620 100644 (file)
--- 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 00ac730bad0cd5dd96bc95514e0a46dc7acae5d3..fb63512aa7656193aa951b47a9fff643c9d8cfe7 100644 (file)
--- 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 4ed87950e61596b3832850a08112486e0ab26fd4..479c5b5700bf69b3f8bb72031d58bd3bd1911b93 100644 (file)
--- 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 13752b1ab265adf289866d67f839cdfc69b919ba..bb184eeb2ab9f5a014ce50e3205ab38611048ce3 100644 (file)
--- 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 ace0a88b9867d11a0dae30e72e8d3ef8dfb708d7..5b58beb762036ad0d68c8eeb6f4986ff0544c87a 100644 (file)
--- 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 5f2e4d1ddb79410111a6eeeb3233f0eef41bc107..9a9c985b2645270202309ff8c3a68248c81da8c1 100644 (file)
--- 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 fc8211b2b6ca9c72d1aeba8a1807f6710f1fdaea..1d41e5668b667b63603bcc6c249b4bd14a48ae4f 100644 (file)
--- 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 eb2b7322e9241ecc73e477f8766f849f345dd6f4..a7bbaa7dedd6ac7d728a9ae3e8ee8f20a093c95f 100644 (file)
--- 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 8eaddfc8462e6a15db746784aef0cc4dac7b3879..722a16a42954b262a1a2d4850bdf936ed7feb6ca 100644 (file)
--- 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 30a55aa3c06397bd20d0debf6f801c5ae9930cbb..d6033200992be01516a67495440a96b143f6d53c 100644 (file)
--- 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 9035cceb9ff64be1e40b087930c7e5dc0076b80a..159cdf51ecac6e247285f80c3b7f114de7e7d69b 100644 (file)
--- 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 28e2800a012de37a98a6cccb6a3b266f1028747c..d4f246374d3ad7843f92999063e5aaee8e14dbc2 100644 (file)
--- 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 36fdd7cee40370cbd2210e97d6921ccfced03227..378a4ac49025b953a904ba324735c0f38fb34787 100644 (file)
--- 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 4613a2c471ea685afaa15c2d7dfdeaa77d4a23b4..be0540dec553542d96c75dd79c66c3a49ac1d496 100644 (file)
--- 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 e5bcdaf47f0b9b601108b7601b6c52c202651c00..0d96cffcc0073e8641d5a2e576f49f49ae321117 100644 (file)
--- 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 8f419ae35c3805d037b52b7fbc2b2398933287ee..4aa34a2fed07a9074640a0a42b336de4cb056591 100644 (file)
--- 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 597a16d1293a9e99a42664038263f8c4058fd746..dd92c7bea370152f504f3392ade98c981e5637f3 100644 (file)
--- 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 b282e7c2eef91588bb0bd202b59e39e7c2c94a09..9ec3bae362e7ad08b2682421e9038610b429b92a 100644 (file)
--- 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 e6e03477f998098c7546c92ad82b720b671fa709..b3ca26474b72e0a17e29233283c366e65b0f0394 100644 (file)
--- 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 45b5fda5a8777a24efcf6301bba9ae46ccccac1a..a118cdf4631e35a1d8cc478e2b6fc57fbeb377af 100644 (file)
--- 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 cb721e08a6b28d11be4ee56f4d68d5152762dfd2..29a01c6d398a6215c075e8632203d1b056b03290 100644 (file)
--- 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 bc3c544191c07873f8937b5c670acd3ba3fe0b72..7d9c2b348556eee9c233868c73d523e0b2bf95d4 100644 (file)
--- 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 675d3451883ea830ea7023cc09ae65529e110d70..da787ab687d4515ab7d6dd2adae26bc81f4302ee 100644 (file)
--- 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 81bd808c4b69b7a8476fffda6284ff00393b504e..329e5d5072d3f52b72963f6e5b57c4c3d0a74270 100644 (file)
--- 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 401006b399816f05d28706f8ce6a68d29360abba..7c0556a6349f26b3fccc2909335eab29dff4c666 100644 (file)
--- 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 0cf3e3749800437e96919d75e344b2a6b476e5a7..f2be1c8d7bd3f2df1a874c68433b09d522702f07 100644 (file)
--- 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 a08a9349edf4c9ba2a258e940bb69fc349f93088..8e8991a40d571f505deff154b097ac7b7c4240db 100644 (file)
--- 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 172f2ef1ded573a4f3a713aa4409ddccaedd5f71..4c90b113b88f51b18fddc67514a32c3c8dad993f 100644 (file)
--- 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 a63b0a3a9278d5ae5560b9149502a8c134842cb9..c8ec77ecb31dbceb4656182a2d6558ec1c8ae44c 100644 (file)
--- 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 d4203b44faf45d7320551f8257861a9d9d561d50..a98ff46cb533c5f309e8d52851135639462dfc9c 100644 (file)
--- 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 ae8b69b798e82a86c6a50bcc7010de8ca317f8ff..288d0863424c9bb569e6a1023b9c526e6ef68906 100644 (file)
--- 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 8eadbd9e8afae3bcbe41681af464d9d5621537e8..1b42848d78dc4a007182fad4b83cefbee45bde01 100644 (file)
--- 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 0162873c8403b488a4b1743dc391bfa644295a1c..cd574d3321d2d2cd78adfa7b4b5520b2d59814a1 100644 (file)
--- 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 03b3d84f3a33681a3169e85ec06af5eca00767ef..b0812fa422071286535ab84bd835c0e4ae9baeb0 100644 (file)
--- 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 bdf253b7b0fd31e0a3df2e1f342ce87fa47961ac..e22fc7d215745554329ad2223d1162d35add6e4a 100644 (file)
--- 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 da372607cb71578d5e7c61d7ea7f16630ba4e6ca..fa1cee9d717abb602390463b392769a7a0fee2e2 100644 (file)
--- 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 7754f60a9986aa48abe038046bc13f55ba293e7c..a6e4d19a8d17b141a0461549174ea3b9935afc6b 100644 (file)
--- 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 ed98e1e5a10a97490c10ea660f2c2980b1f57673..e1a6ca30c974a73031248319a348209cc1d87652 100644 (file)
--- 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 b94366203a01df8057fc71f69748f290af7c21c0..f307b2002a204f6972b49026a334eea23df041e4 100644 (file)
--- 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 fb7f9d19c68fed682504978c8ce104d5c428baff..9a77032996b1ceef089528802fe5f950d587c63d 100644 (file)
--- 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 ca8622d3a8edcdc72db08ff9e040e587ef80cc16..3850b44f18f896e9e5a73899ea31c31b883fc0f8 100644 (file)
--- 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 eef65d8aaecee0c8b29c09a32ab6975a947f0c81..c1f2a11ab5daf9eb29e435b9fe3567373171c9ce 100644 (file)
--- 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 9362d7ff3acfa10f8bdd165d51488184c8a3ca1a..10aaad5ccd0025c29cdee0a9ffb8e294a8d63798 100644 (file)
--- 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 003ace9d11e16dc3afa619189e3fd9ce75b64fa1..d74f57b767a07e3c2928a45840a3a3a64c4e5e22 100644 (file)
--- 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 fcdd7e0daa2d0a7db19b0b571cfe7730c1708cc5..1667eb47d06da14cd3eca2466d77d89762075cdc 100644 (file)
--- 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 64c2ba31ec5a0d30e8ed9f041f3a5f2156147c03..418de89d9a13b66e1b94c48b1394acdeec3cfbf6 100644 (file)
--- 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 058468c10bd0496c31f427534f4c37951b6a9e56..22849aa5d17ef9fb004073205461df14b36ee854 100644 (file)
--- 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 2c6bbe9745955cb6adfa3204c9778b9044310112..17d1a3b4460252e2bcf5b717623c5e539ceaf160 100644 (file)
--- 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 (file)
index 0000000..8ea74ae
--- /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 24762cc99ab1440e7bfa0a242b17ad79053ccb66..a09ed2274226782865c53793e752eb9f5adbbeda 100644 (file)
--- 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 bdbb790b131a6e33be7c0421e0ee68dd224b3fc8..9fbce3eb0127606f3aeed2b4eb71086bc406dc67 100644 (file)
--- 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 f409baadc03032de35c1a2b59f15e1d47c80f6b3..d94e0dbbe352a958ccd5ab8136c648ba25ae7778 100644 (file)
--- 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 006a5d4babc8ffabbd11118267628def20fdc6dc..a0c5f1f8d4bdd66a1b72b5bd26c6113a288ae4eb 100644 (file)
--- 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 437e39304f396fefd8782b364b1480bface4cf46..8ca387ab394865afa7614c5132d9705ef0b022dd 100644 (file)
--- 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 bbdfc578b7345b3d22471ff043db9cd829e0219f..b3235092a0429971163228bdf8a8669b75c91b2e 100644 (file)
--- 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 43fa433d09d6d1782c388834a893f963f5da0646..515a2107aa4405e38e8364121ebe43783202d9fe 100644 (file)
--- 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 ae1d91180ef9b2da6429e4b7f0a6315ae2c29b79..600c7af7e1e36863ed2914b4432890dd31c174c0 100644 (file)
--- 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 4823f51d56b6fd8a95723ead181f7bac41416883..e6e1037a9cb603ad91a8fbce30440756a533d0bd 100644 (file)
--- 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 0d1d3a017243c004ddfff01f3c9f5e7cb9e3325d..c1d66871819cb3b58ad5f38d534d04b359161e92 100644 (file)
--- 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 e19e63564ccc31c3056e3eaed5660e57025e2a96..1aecd16e48600dce919b5ac98215836ed7c382ae 100644 (file)
--- 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 7323db78f0331fcfc910b447db10713291bee3a6..d302e38cee0b2bbf1b33dcca293bc69541354901 100644 (file)
--- 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 d25347ade0df60d4691f94c9261b18735434f597..cb54c80033c65dba72e6ba4749b41cf3221c8a23 100644 (file)
--- 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 40fabe1ce9ee0ef4559c93e80a6b9d111b83eebe..e75a04f36ef0dbaa6647a0f70b52431038485989 100644 (file)
--- 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 da41894b1186de2944f3fe902028b1bf05365d4e..2b754eac36b319ee74bd500542030b965a080811 100644 (file)
--- 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 671b3821e2983a81a94be8986e2e36c00ac1a0f9..f15365f2ecf86727b3fc21e886125cc70bcb5122 100644 (file)
--- 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 db9ceb382394825fa2844538d7cc9f1e7da0f69c..9b43e15bdfd802deeb733c8f05502beb375eeccf 100644 (file)
--- 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 fc9f7a802253cefa6f3f2e1cb87327b36340e414..8ecf516cad562c78c765a0ca44fc9f3b110da75d 100644 (file)
--- 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 80a37f8f93df28b1bb7207646ee8a278cbb2692b..d918cc40305b0c97f51f1a7c3b00be6809f04a4b 100644 (file)
--- 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 c57b03726243839cc40e3ad350cd3a84fe29d49e..786a716e3520aee247fff8626842843d8463412e 100644 (file)
--- 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 09f7d6ed321b863c640c1388892536dd4e35cb7c..032f70a878d81341013478816a8a71d09e05e676 100644 (file)
--- 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 a8cc59d7cf2c2ddd7a775811cd73e137646f310a..5bfb001a1855df6c755a8e6e717fa4890607d59c 100644 (file)
--- 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 0a8a7dec2cd76c9c5acd7287aa6168b8fe9726c2..26401e7cce71432fac9ebf9e9bb128a1dc2ed3ce 100644 (file)
--- 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 e891f08d567b88a4304e3b30d5ea2e45e167b3f5..9d3032cbb9cd3d27cc0da0780c57af24d4703e6e 100644 (file)
--- 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 99d573200d640e8f69ba1129d094fd22cb135e63..d85eb9e6ffecc4a6ee7a6e1b8524c360cdf0d18a 100644 (file)
--- 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 6c8e58a88a780e1d759fdbf8795916e3c1eab075..c9ed7ccac7e30077de23ce9c6d8cf85bb1a8919e 100644 (file)
--- 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 e7e7d12d85fb168fe8f177312cd3cfcdef567d15..e8b2618f70d9f9cca45580bd606dad1959434976 100644 (file)
--- 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 6ea05caf64a759daf647824f5fff13393037c34c..6aaed3eb1f10397878e0c44998162884d166e81b 100644 (file)
--- 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 dc01154daac83522ef2bb2577c720d5fa756d6d6..9bbc802c23b73bd0d07d823b2acf85579f3b689d 100644 (file)
--- 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 3ba0218a3aef79c65d0a01e72d1b7b88683c0e66..5106bb7e84a94946a98475b146cfa705b050429e 100644 (file)
--- 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 35bbfb7ba53b91e2dfcad889393dbef822f742fb..ce7e82dc08fff364d0e25fa2aa2cedc3028d72b6 100644 (file)
--- 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 57952967fa3a3cc57cfab78bffbe672d971ef576..dba9f2f557127ac30af21709e982fd1240f8fa38 100644 (file)
--- 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 2eb7cd28d1bc30b243b8958f70e880204c6e55ef..5b4dc56711cdfb12326e4ea7303e418ab001e4df 100644 (file)
--- 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 a8ad58e00d6ad79a3073480cdf2790614f046ac6..81328e621bb55b0a038836a449b378f1b0f83d9a 100644 (file)
--- 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 9c74408c20e067740142de91896c5efa999dd86b..6c0a9a51e0a321978d44f878d28f401a5708de28 100644 (file)
--- 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 d7e255b83a54e8a5ae39e953912a9cdcd862e0f8..2c169ed3f09223032fc688307e073e0f05fce2c5 100644 (file)
--- 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 fa9825354cefc198aeac95de3f1a834d730ee6b8..ae18f0ca63f9ed6ebf0192b4159fb8b4b31caba6 100644 (file)
--- 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 de21d2cd631706cbfff9bb0396f9b33fe8e345e5..0acec5477c3f2eb99597cf96c874a607b79fb693 100644 (file)
--- 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 054bfcb29fac4b7603f8dbca0adaab5a41dd3472..71c2349224ced2ce3bc30ea93e22c3a7a3243bcf 100644 (file)
--- 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 3689c69fc4f3c50a307a1fc72a44415c7784faee..d5422dccaced3e9ef9d1519b6c602302257d7f73 100644 (file)
--- 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 39cfd0518fe54460673dfee887edb99b78831215..f164c4e19bb5ac61c540ce44408ef566408dbcbd 100644 (file)
--- 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 9fc795a1092f05fa2ec9ff8b90e8ec21b64292fc..fc7efe4b2d54130102dd3027936137ee698db6e5 100644 (file)
--- 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 a9173d093e7a459e5533526badbb44035fb49884..c76742226d9e601e8475dd1e33e9a5c59aaaa169 100644 (file)
--- 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 fe3434cf635d747eb74d16d46ca97d78d92dc9ef..552c24b11d8bdb7789cffc9ca026a38f72d49d40 100644 (file)
--- 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 6723fdb6562a1a9c0e5b797c1de35cb442f48870..bb44fd41898742d71892524371e73909262c630b 100644 (file)
--- 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 be8c3075d6bb78c50a27cdb80a95b5a220578005..5c63b86f67e45626473d1ea651e8de6d47ddc501 100644 (file)
--- 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 207471974767171a610a2bf6508187c7ad898cf4..9d17f1a75730edccf87801a163a40b6e070ca045 100644 (file)
--- 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 81626346ac4658c22e653a2191020052e6b6639c..9609a7c5dfc43379b32fb2a001ddf7ed6405ca25 100644 (file)
--- 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 d5d8ad11f645a39f21fa537d2d9e5bf2044fccbc..56df324251e7f0be3f1a39805c8dc595ece406f8 100644 (file)
--- 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 32f57078df498a3a9af24c325449ccc6b1ca3da8..1454353583307369226b7a22a39069f8c684132e 100644 (file)
--- 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 745787f7ffad1bed73f4fd75bc11fbe38af3ba86..d49e399bbfb4e845b6a6c315d03ee906b5b8f1be 100644 (file)
--- 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 50369a3723b8016dbf4cbb996c2f759da707689e..0bb90fa71430d97531e373fbab424fccef0c3e52 100644 (file)
--- 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 0ec64f777b921b74a005bcaec416f11afe173734..8f9fcc7f2df5227870423e67b8c0892b409e8a9c 100644 (file)
--- 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 128e07f8208ddffacf6580c43c5db884a306cbb9..314853dc02385fc521e13f28d08fb283b0ae4369 100644 (file)
--- 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 dd1ccfdead533133ecb341f787c527c16ef8ce58..26a1e76c739f22503b46dafde80efe5f96a34d3a 100644 (file)
--- 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 6d835abd8b074ac2e9a3595de2538dfb1f7a8544..880ee321f04781b1c1aa089c0723eab51f330869 100644 (file)
--- 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 9594eb526f2100a0e5adb738edff2cff5dc68e99..e2dff9befbafd2c88d83f2ae9f094a38e00a24d9 100644 (file)
--- 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 fea641b816634e870b0861004271fd99facdedfc..d12957b1130ade233568ff572fa48a1ea0e1be65 100644 (file)
--- 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 ede0b3b41d574ae4cc0a829cb843e47e75612850..8c2926a0b80c0da648db56a2838e1f0f5e47ee5c 100644 (file)
--- 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 f76cc700221088ead738c900c5ed9226d0205a1e..63fdad28b471b3e1b6819a5b4ec62457cb63b2d8 100644 (file)
--- 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 69dfe8763d73583fe2488433542a363c6f7fe582..f10cc4cfa9f24caaba13c3eff2eff6cc95218e0b 100644 (file)
--- 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 2583bf94b6d20071a34d2695c1616891dbf177f1..661018be76943756404062165e1613626fccac4f 100644 (file)
--- 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 8760f21777192467d05c8966e153c97434212822..5094b9a8d3571f47c168c98440d3949c0c3e25f3 100644 (file)
--- 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 3984326722298b91715d10b5da58a2e274123fb4..a5491bf9737b2868c1373b2033a47f765ff17bb1 100644 (file)
--- 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 94f99647584e5c0d64cde53536bd69bdf3659b9d..ec5060f4f6c5f9cbf47b1e275523a3d4de0b7c2e 100644 (file)
--- 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 0d79f8f88f9c8b30e4e593d88aa7a2fe29107fb7..661c12dcac17122dffcf87b3c23c7cb2ace352a8 100644 (file)
--- 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 a9a7980229fffd159e6e07bee6fbaeaafbee4cf2..bf74381788b5a8768bb5c69aed5a742a694b4c3a 100644 (file)
--- 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 1f12168841fdd587ba0b64fce466d0d67439eb2f..49de0d7fadfa3ce4b7367f71f0986c393035caf9 100644 (file)
--- 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 f28479bb408dcd41c6c25a575e430bd4cf6ee3e8..dd26fd71ba6e2db60d8e27a6a0b38eb5273ce6ef 100644 (file)
--- 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 5bd78a9c1586e59f71d5c541c06fd2b996c7eb2b..29ff65780cc5341f201216f3b061c0321a404d0e 100644 (file)
--- 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 118b8677c857cd2bc784ab311bf603aa242f057b..0dc49c72f0ecf02cd025996da2f8a16fe795f2bd 100644 (file)
--- 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 fc99ecf9e55c66894218ecffccf4c80ad7f05942..88825573c1aa01fcc54c4d57a4b1dbc870da7ed2 100644 (file)
--- 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 70af3c4043c4734e3a4551c459230b9e0665a829..f1798cc2c8aa083a5187c5c62c51eadace5ce835 100644 (file)
--- 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 d25d5321bc1178c2ab32580a621292f2c7452fd8..01c37e309ac215223cd71b1407c63efc18c11853 100755 (executable)
--- 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 9f8bfe7d78e1555a2437ce5a46810c9b2a28771e..13beb69fbf6cdd82b61b456ff77ae13130daf851 100644 (file)
--- 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 ceac6448978fa7e94cda676135002dbd4d6c56a7..a6cb0ed8d5f3034b12cebbbec88479033eb9aa91 100644 (file)
--- 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 443259887b810152ff680463d98a817630c821f3..d95a7b41ba97c41ef59f3dc89493db9c64e440fd 100644 (file)
--- 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 8c1d8bbd02493e855ac0eaeb9a78c213cfba3258..162ca86b43172fc8eb0b55ab977305508e5c6815 100644 (file)
--- 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 de62b57391e1615d9ed8180628ed805b8c50352a..33961d40861b96ec8764523361af34df348abd28 100644 (file)
--- 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 12cba90dfa70b8a5c2d7b8340d89fbee48bf0952..973a447e13d09fc2d2c6fa55ffd85e69d1814d89 100644 (file)
--- 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 e141d3e230b04434cfb44fb241d98802cce19a9a..723013f552c5735f9da3082c7c50bffffe8685b1 100644 (file)
--- 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 f419205eaae9fd8845259cb299de483a46c55d09..1dda1dc205e148d8674a34dd3379ef8b95d2f0f6 100644 (file)
--- 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 8f20c7edd3b4eb0b7bc60fe788316408819cd4ed..effae2bc24957046b1eb7fa3a163f2ed1be00626 100644 (file)
--- 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 ad9645177cf38e4f06c9f9d427df0f9efe82f9da..5dedd47c9615d9a29e7a9908bafb7b9cd010a76d 100644 (file)
--- 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 92961977f39e465185beebeb1938a257cd55f1be..8e30344159259dd3ac4d638380935e602e3adafd 100644 (file)
--- 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 7b421014dfde7df48326fb35cf8ba8718e282b84..525921f4c3dfbaf9e493265f6f6e7eae95a7ba3d 100644 (file)
--- 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 58aae0af1f9abc0b4e78af8a5c0b693db4800d2d..f4b8fd9c17ca6c327b13e051363df8865d8c41c5 100644 (file)
--- 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 fab24a7f9afd54590c62b936ae5d381967d86e99..ea1f276b1ac6de2bb4f6f93ff96f1b4e7a7cae74 100644 (file)
--- 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 fef4cbb3212fb288a1adcf66279c7a1ccc1aaa9b..cadf92c10736f5ff8001b9efe7899b1bcd200996 100644 (file)
--- 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 e10b3348b7a34954da1869910c07f231d4b0c836..27ec10f209da0d1d899270145a06091d0146ac84 100644 (file)
--- 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 167fc0f80dacf6096bfc02b6fba3e88db05fca77..dd67bb32a33cc3f99c048b13d3e1cb7142392249 100644 (file)
--- 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 b876389f18bc1a634e8a0f0eb88d16e9c8f7d474..929587dafa5387fe246485102b25c6a96525fc68 100644 (file)
--- 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 2ea5ceb0c33b70467d66d774c5e3c407523d4ff0..9e69ce4f5738ee4554273759b997e6bb65682a52 100644 (file)
--- 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 6c557201bdf758debb813258998e9db163ae2130..bcc60d772106c3f8078f1b847e3420db9969f5a5 100644 (file)
--- 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 d9335813be9c11abda943b1264103492504b23c9..8f06630e5ce25bcc82a7a9035f853cd16c16c6ca 100644 (file)
--- 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 4bdb54b1cb21d85de282d260eb54923e58f5fed1..71d768f2907bf5f7f92edbbe18399f8192b4bd0b 100644 (file)
--- 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 3bdf6bb78b3386e02e5f61db521173f3bd61da00..1732a1c9d1990f0e060a3ce9964157207dcf3eb2 100755 (executable)
--- 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 efb72d28595ae4f39b61d931ae2f6577342fd29c..1aa2878dd3220c7cec94f0be5003b46355f9265e 100644 (file)
--- 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 3b8813aeb7e26ca2c58d81007c7b3e310cbd0ce0..eb39a917350673d468d6ee4c253671120e9129b5 100644 (file)
--- 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 50be4a59378025062dc05bcbfa731d0f424817b2..d822e0a52b4a5ba1375e81e7ec9c2a64eb40e992 100644 (file)
--- 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 2858e40346f668360bb5b684855fbbbd323f0000..464519d0f8146d04e7b2b025e353d39fe50a38db 100644 (file)
--- 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 c92f93762b1ca0880d6560f59a03258dbb988e55..3912f527880e44c6f5953aa32e4cd5629b901ba0 100644 (file)
--- 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 a4f20cb75efc1bc0870bebf4025dd65fa09e1fd6..1d75d5ae82ecc637788cf23b9d2cb703e5a1a5d5 100644 (file)
--- 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 22f89fd053e0c381a641db89cf988b7d50f756ae..caee2be4295369f051ff537a4cdb9c19f1b571ba 100644 (file)
--- 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 78f2fced19f11ccec80d40bf71268006138d9c5a..7d781d6c9e20fe59fe89777edf655ff502c5e7e6 100644 (file)
--- 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 4a321bf30ebf351eac4da1b23166fdee55556968..38b3c00bef6f124c3127304b5cc6d7a46daeee89 100644 (file)
--- 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 269e7dcf39bf406d3ed0df268733d2fe467e4c8c..77047a19cb7e0cf2d6b2606f3eaae3c82e50429f 100644 (file)
--- 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 cdf0b5eecf7c6c9b48dde65a25c3e09e28a0c90b..0ed39f4ee5324437715aaaa4014834650593b0ab 100644 (file)
--- 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 7059608ccf1e8acedf57317046f9b8b52d490a86..07d565dafe15eee68203930d4d8587d6accdd2dc 100644 (file)
--- 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 6156936f34dde099ec4ae8cf3cdb5610051e36c2..abedf56b21d502e43dc812f9331ecee3c4bcd0c3 100644 (file)
--- 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 cb7d507eb8ef8e55cbd514a53b8e67e487d5e5b2..26bbf9649c2b3c84850b36ef086d72fcff322a73 100644 (file)
--- 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 c5d88bf277db94ff9ff81b7eb14fd959d0e56b9e..810f19fdaaa2dd0cfd1aeb0303e0e2d098002161 100644 (file)
--- 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 0b39a1b6d6107759fb42455af713f9a045fe7807..9aaac980400bf21efa72b6171b879faf3ce96d27 100644 (file)
--- 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 8fc9380b3ff25a5a0f69d0baccaf414b7e5bdace..8f4a989bbf4350c4ace8f139cfe8a5fada2c991f 100644 (file)
--- 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 12d76e8d852a3bd22b209b988dab6c00372286a7..a7d36743c050aae6c56273d001f955b2b4ee6f3f 100644 (file)
--- 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 8ca45691e5a7347e7184a35bfaf02ff2f7a69493..07a0ff34d6b7a272411194620c5bf924c54d37db 100644 (file)
--- 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 4e03c66f2a0ccfbf4bf4a90dc114b10486690aa3..ab871ce95a2154b5118dfcd5878d6d534d331f1e 100644 (file)
--- 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 a1b0e2caab2d699e0f2ab78f8c612943a7c3dc22..00750ee7d450e442284d3a3a71225bd23856b51e 100644 (file)
--- 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 34f7831896033bd99047f1fd1d64680af9a6d02a..bb8e87ffb5b0ad2f224df76bdc98c5129d1c3fd1 100644 (file)
--- 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 ba8868697176b71205549df44117288c659932a8..6fcbcd31b19e6c9ae5e310e47d7e24f3b5b0e291 100644 (file)
--- 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 3040d316a733e9d8631440de436a64ba21798ac0..511f7e3e19027942ff8dc62a01c962a75a74fd41 100644 (file)
--- 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 e5bd304848b16d56dc8edde837d5b09dd444a4e8..56508533ba29db3ede7ef50c947db0d7cc6c9ea8 100644 (file)
--- 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 dbe86805ae47294d150c708c100913e77e2582e9..b38f0cd684b348f055e1591c1e9b5bd7ee37639c 100644 (file)
--- 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 daabed8cd2da291482432723b8035af55ede33bf..246158e4cb6cef73adfd06eee35fc8c2b9157ed2 100644 (file)
--- 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 b5f8d59160a74e95a9ec47c3264525b9085757d6..3418f68e03e6004044477929567e7edfa3ba588d 100644 (file)
--- 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 16f9baaa5cba7771fa8a5b826d7e2afac15cdc6c..59fde718da23264d7954721f54cd825863f259b6 100644 (file)
--- 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 2c46e142b8690787c1ca695f4d54db6dc694b690..ffb77fe0a5a8ba6139a3963e74446f82681e38e3 100644 (file)
--- 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 f3c34c517ca0f82e9f90655889a411be67f4f5c9..d1d62c206fda3dee0873e919ffb2a8b55eb6aceb 100644 (file)
--- 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 e4e57138f388526a817d2aa27aad10f64c1aee46..19c228d210f1d4d0958108357acaaec905469085 100644 (file)
--- 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 ac0c07c940b1505c01922c998f1f6f2532ddec47..6f7014831fd2c1bc347be92d9b7d9c1fc35f3b10 100644 (file)
--- 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 0846599b3ef089abf2faa9dd6cde82edbed572d9..980deee2b1b3f8e4502be9ba67b887d83c35f2a5 100644 (file)
--- 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 d858c94da088d893983104aa814b2cbe5a3a468a..e63591a10867ca920b2d9f66e70a8b8c93e8f5fb 100644 (file)
--- 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 11c0e12e2a0dfed21e7e09460fe0d7a865a1747a..2dbf487ac3d4ca9f48762e37d451a3a4041498a7 100644 (file)
--- 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 db9defc637e663d70a29e0f06a50cae8c8043915..12c1a34bcbaabe766470b0d5bacd0cbb7f2228a9 100644 (file)
--- 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 e58f6b00015d444635f02df9eca8cdccf10994a9..58a7f0cde071f9efdc2fcb3633805a34d5022e44 100644 (file)
--- 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 c562008731e0722935635657d1b95b2e8f63ca13..1f493d2f1102273e41d2ff95da676780f2029b00 100644 (file)
--- 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 27ca3890937e83cf37528eedef0f377ef28975fd..b4bb34a6750acf2e1691380abb01515e7a6d162c 100644 (file)
--- 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 6a7131b9269d771cb5425fcd94d75a79048a7792..dab805c1b57749a964ccb4fca7966ebbd0724264 100644 (file)
--- 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 bf13c1e2b25654fb8a72822fe7e89e57127366cc..7fdabc001c6a8a567a32c30d284086d2930d1cde 100644 (file)
--- 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 2e323ee1f643c5c114183f127ceb7d6be6f2ebdc..43ec10c4f8dba1a3505997ed8b4ba31e7ab01ac4 100644 (file)
--- 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 f08250292f3d302c84c6bfd15974f1f94fb57119..717b39bd5b9ade9bdafa25b13cbd754e103d0577 100644 (file)
--- 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 54e4aeb6092a29bf2295c0daab02d4b0d0fa3ae7..c4312c603d49048a7971e1916735cfa821b01482 100644 (file)
--- 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 164326db4c96f854fa12376b48a7595c6a3e439c..50bcf6503f59d33853fbe49ef8ebe00fae6caaf4 100644 (file)
--- 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 9f8f824b951af64aff2f41d57e0326bc3275c06b..b8ca14eaffc7581f0855c58d95bbde64a9a4f29d 100644 (file)
--- 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 db5a21cd011ee4ec0abb06080f9cac960113943a..7d0154d24cbef131a800e4bfa22e94959434412d 100644 (file)
--- 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 1bfe19836bc2e8a4c539205f2d7c95c0f7929888..0347e66bd51bf604dbbeb4e4d5d022f2328d33c9 100644 (file)
--- 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 5cc83977d0f71175151109d015a81a218d27421f..4f3bc6142882323d0b5c1efa9f0c0536a0487ac7 100644 (file)
--- 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 92dfe6432139b473213ef63319049540c04e350a..f55acfbbdb248de32dbbafdb7e99293a6ca38e78 100644 (file)
--- 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 35879591ef1523c01363b970ec05d372599fa719..115e1a52e6d666a8862c25e1b7e17e884795cead 100644 (file)
--- 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 903ba23eb09a4cd4d27be1ae97dac9a0bbb05040..9f8864d2865dc014128e07371535373bc87b8896 100644 (file)
--- 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 12235fc58a70ef073108d440bd1256c4068b8fc9..34d3bb20159b7d2d4d9a633db75e0b437a437280 100644 (file)
--- 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 f6e509ae02aaa55b0b3b134f9df49a39730acfdc..f0b77576497b8c7987498ea6d6f8d20f214d094a 100644 (file)
--- 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 d90248c7165d633676a055c9b03dae5580b03264..4f173eff681db92549ddf8d28714c833fe94176c 100644 (file)
--- 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 6c6936cb6591c7fd83edcd9c193001860204d524..5bd40d84f467bb9c06086b76389fc5985d9cda67 100644 (file)
--- 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 f641819c9c8a7f3188a199a4e3b6752c4f9a987f..be8e59544b566b55eb08dc668beda92921641664 100644 (file)
--- 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 b946d31f20012cb369d9bded6ad032188b293d2f..b8a97cdef8236281c51fc137ab6583ee255324d6 100644 (file)
--- 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 b74808bac84145fe80caa7254f2125a2f433802e..4802a98ff6286dcdf19d0b31b73e2e8d936116b2 100644 (file)
--- 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 13e2a1182a1de9a460890586cb00aea9b77f0462..206cae30957eb8664868c3fe825389fe47bf0abb 100644 (file)
--- 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 67354894441ebb4d9cafd48f6c4d7eff8a885ac3..a67060a1c4a398d5bebdadf97f8179e33a8a8d12 100644 (file)
--- 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 2f53aeae2ad65286eec171cb15f1dbd35e5d1b9d..d1b09f10437d64049982ce2a78fcf5ac44004375 100644 (file)
--- 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 c1663131b50f270ed61f03a08ac92434557e39f2..0293fe86967778ba714855b123b4d0e180f84917 100644 (file)
--- 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 bdbc0e2f7010b9582b9c61940019a8e2432495a5..9bdd246194b8c5eca6b515f76e26e0f4125c3240 100644 (file)
--- 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