Using require[_once] instead of include. Adding logic to connect.inc to detect multip...

diff --git a/ext/mysqli/tests/001.phpt b/ext/mysqli/tests/001.phpt
index 4e19d810909c1ab99bd43a50e43ed64c3780cb7d..ed09b2eecb055f25ac76a7b33ebc61bcd8529b74 100644 (file)
--- a/ext/mysqli/tests/001.phpt
+++ b/ext/mysqli/tests/001.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $test = "";
 

diff --git a/ext/mysqli/tests/002.phpt b/ext/mysqli/tests/002.phpt
index 6bbdecfdcc5ddc387b915259ad3681983a15f893..c18310871ef74a1133606f9738803977f6d1b200 100644 (file)
--- a/ext/mysqli/tests/002.phpt
+++ b/ext/mysqli/tests/002.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
@@ -48,7 +48,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/003.phpt b/ext/mysqli/tests/003.phpt
index e22fec143e96136ef9a07845ff04610d6a1ab1f7..9094c86a76a3b1649507387761480b41ae305334 100644 (file)
--- a/ext/mysqli/tests/003.phpt
+++ b/ext/mysqli/tests/003.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
@@ -74,7 +74,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/004.phpt b/ext/mysqli/tests/004.phpt
index 1eae99df705529b220f0e46976ec2bece9c6b16c..184eceaa891bed72375a04fd0e94142f41e5b14a 100644 (file)
--- a/ext/mysqli/tests/004.phpt
+++ b/ext/mysqli/tests/004.phpt
@@ -49,7 +49,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/005.phpt b/ext/mysqli/tests/005.phpt
index 728f45e06cc832d8d0265b6755c155c191d20dea..0d59f40b7ec339defd2d26232e1fe4fccfd165c7 100644 (file)
--- a/ext/mysqli/tests/005.phpt
+++ b/ext/mysqli/tests/005.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -42,7 +42,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/006.phpt b/ext/mysqli/tests/006.phpt
index a10e22c44c69c4222b2cfddb78f47e7ee9c5fda5..497426598cbb2b17026107ed184862d63ea53db6 100644 (file)
--- a/ext/mysqli/tests/006.phpt
+++ b/ext/mysqli/tests/006.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -47,7 +47,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/007.phpt b/ext/mysqli/tests/007.phpt
index fe266bf1b2ec2979e3de27ace554a23ef00dcfa4..05a8ae5bafe275c590ea795eb4d31a1d1350da9b 100644 (file)
--- a/ext/mysqli/tests/007.phpt
+++ b/ext/mysqli/tests/007.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -47,7 +47,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/008.phpt b/ext/mysqli/tests/008.phpt
index 685110f08e4191bc9652c144fb2c8fc7b1a6ad33..ba0e3408914b585bed5fae7c76cb09fa124ab6f9 100644 (file)
--- a/ext/mysqli/tests/008.phpt
+++ b/ext/mysqli/tests/008.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -47,7 +47,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/009.phpt b/ext/mysqli/tests/009.phpt
index 0584a14cfde4bfb683fda6676a2b71d5d33952f8..3e26f518ad26c285e2ca4209bd18c14db65982ba 100644 (file)
--- a/ext/mysqli/tests/009.phpt
+++ b/ext/mysqli/tests/009.phpt
@@ -11,7 +11,7 @@ mysqli fetch bigint values (ok to fail with 4.1.x)
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -80,7 +80,7 @@ mysqli fetch bigint values (ok to fail with 4.1.x)
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/010.phpt b/ext/mysqli/tests/010.phpt
index de22c0824189f4198b8bf9958a7e0fb515f70b57..fab0c578896723190f44a1f76fa547cf952b947a 100644 (file)
--- a/ext/mysqli/tests/010.phpt
+++ b/ext/mysqli/tests/010.phpt
@@ -9,7 +9,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -50,7 +50,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/011.phpt b/ext/mysqli/tests/011.phpt
index 4c4ff77069b823daca6cd6ea92c98c05c187d371..83f35e5869b8b6ec160e98fffbeda7924f5c47c4 100644 (file)
--- a/ext/mysqli/tests/011.phpt
+++ b/ext/mysqli/tests/011.phpt
@@ -9,7 +9,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -47,7 +47,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/012.phpt b/ext/mysqli/tests/012.phpt
index 2ce81040051c4c2c53ee9decf3e483676228803b..da4a48ab5131b17669abf39ae0efb5c94825f824 100644 (file)
--- a/ext/mysqli/tests/012.phpt
+++ b/ext/mysqli/tests/012.phpt
@@ -9,7 +9,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -46,7 +46,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/013.phpt b/ext/mysqli/tests/013.phpt
index 8c123d1ab40a911e0b806476d72f8331b5ca5b0e..5ddb49632ae2dad79ea337c781c8c8d9b0a386de 100644 (file)
--- a/ext/mysqli/tests/013.phpt
+++ b/ext/mysqli/tests/013.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -58,7 +58,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/014.phpt b/ext/mysqli/tests/014.phpt
index cd7fa19c7273b910aa1eafeec515cb4549b99b4e..8fb8cceef65b7a51c4688ef09cd0f7eba5e888ad 100644 (file)
--- a/ext/mysqli/tests/014.phpt
+++ b/ext/mysqli/tests/014.phpt
@@ -4,7 +4,7 @@ mysqli autocommit/commit/rollback
 <?php
        require_once('skipif.inc');
        require_once('skipifconnectfailure.inc');
-       include "connect.inc";
+       require_once("connect.inc");
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
        if (!$result = mysqli_query($link, "SHOW VARIABLES LIKE 'have_innodb'")) {
                die("skip Cannot check for required InnoDB suppot");
@@ -21,7 +21,7 @@ mysqli autocommit/commit/rollback
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
        if (!mysqli_autocommit($link, TRUE))

diff --git a/ext/mysqli/tests/015.phpt b/ext/mysqli/tests/015.phpt
index b3af0142ae79124e24e736ca61200572c5cb2aaa..f42129f872bf6dfc682f4f3356c7e38b5ae7faa3 100644 (file)
--- a/ext/mysqli/tests/015.phpt
+++ b/ext/mysqli/tests/015.phpt
@@ -4,7 +4,7 @@ mysqli autocommit/commit/rollback with innodb
 <?php
        require_once('skipif.inc');
        require_once('skipifconnectfailure.inc');
-       include "connect.inc";
+       require_once("connect.inc");
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
        $result = mysqli_query($link, "SHOW VARIABLES LIKE 'have_innodb'");
        $row = mysqli_fetch_row($result);
@@ -17,7 +17,7 @@ mysqli autocommit/commit/rollback with innodb
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
        if (!$link)

diff --git a/ext/mysqli/tests/016.phpt b/ext/mysqli/tests/016.phpt
index c8046de9a10bb71285a49a5f92b307a7b7222cc3..ce1ea83062e3f9d54bd818d7a14ec793572f26f8 100644 (file)
--- a/ext/mysqli/tests/016.phpt
+++ b/ext/mysqli/tests/016.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);

diff --git a/ext/mysqli/tests/017.phpt b/ext/mysqli/tests/017.phpt
index 7220b4ef09368afe057b8f0fea4fe86e40f2eb0e..a48ae5c9d6ad6b09bb44dfe3dd6ff9ea025cca55 100644 (file)
--- a/ext/mysqli/tests/017.phpt
+++ b/ext/mysqli/tests/017.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);

diff --git a/ext/mysqli/tests/018.phpt b/ext/mysqli/tests/018.phpt
index 1a8d76208876dc78dc775a56d1b018c9e9da5381..87476442d2c014cc9f2844df0b1ae69b7dd83aab 100644 (file)
--- a/ext/mysqli/tests/018.phpt
+++ b/ext/mysqli/tests/018.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);

diff --git a/ext/mysqli/tests/019.phpt b/ext/mysqli/tests/019.phpt
index f3741a5d3299cc3010aca89d94c4c4977bcf538f..51cf973324756af4f9ea81717a4b40c00e96d057 100644 (file)
--- a/ext/mysqli/tests/019.phpt
+++ b/ext/mysqli/tests/019.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -57,7 +57,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/020.phpt b/ext/mysqli/tests/020.phpt
index f313a616a1e7b587ba0c506beb9170f765340ccc..6e867d7a0f43f46d7a986a6c71c95af999db892f 100644 (file)
--- a/ext/mysqli/tests/020.phpt
+++ b/ext/mysqli/tests/020.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -69,7 +69,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/021.phpt b/ext/mysqli/tests/021.phpt
index 3843566ea2d44e08fe41ee9fb4ff3ecca8f4c932..5dec86c90bb61bed164147290fdc6e9f24e1fd84 100644 (file)
--- a/ext/mysqli/tests/021.phpt
+++ b/ext/mysqli/tests/021.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -40,7 +40,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/022.phpt b/ext/mysqli/tests/022.phpt
index 5c448b9c1ed6fdcbab0aaa4918c889c17218ef97..8e1f0170a5e2f1190140c8b29b14c4623e2b56e4 100644 (file)
--- a/ext/mysqli/tests/022.phpt
+++ b/ext/mysqli/tests/022.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -45,7 +45,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/023.phpt b/ext/mysqli/tests/023.phpt
index d3d4762a6ce71131ff7e2ce6b715cc9a83ddcb20..97c7812567b03153c871621835b6c4774b780037 100644 (file)
--- a/ext/mysqli/tests/023.phpt
+++ b/ext/mysqli/tests/023.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -54,7 +54,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/024.phpt b/ext/mysqli/tests/024.phpt
index 7dd54085374325d932dddd52e801d5745ce68e58..2cb93be965dac62b3955f8c5b7905e655052e95a 100644 (file)
--- a/ext/mysqli/tests/024.phpt
+++ b/ext/mysqli/tests/024.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -54,7 +54,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/025.phpt b/ext/mysqli/tests/025.phpt
index 9c076dfaeb51b67fb455f7060e855042cc78cc8c..84a9f67a1929c94e220c64cb460f7502c2d95e96 100644 (file)
--- a/ext/mysqli/tests/025.phpt
+++ b/ext/mysqli/tests/025.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -59,7 +59,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/026.phpt b/ext/mysqli/tests/026.phpt
index 57fe33e0062f570184c02b4c4a08c38416fbb68d..ec4baa262d0196716b1f3b09163aff29ae173165 100644 (file)
--- a/ext/mysqli/tests/026.phpt
+++ b/ext/mysqli/tests/026.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -46,7 +46,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/027.phpt b/ext/mysqli/tests/027.phpt
index 0926b70e27ec6c738e13f4cd92bb5b814fb29dca..69233d683e0c01d51860b3e54bb23e5798183417 100644 (file)
--- a/ext/mysqli/tests/027.phpt
+++ b/ext/mysqli/tests/027.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);

diff --git a/ext/mysqli/tests/028.phpt b/ext/mysqli/tests/028.phpt
index 6c4425e2b47ff00022f5faad0f8a26b92be05868..af453dde015c0f7115a935586e9be574859adf95 100644 (file)
--- a/ext/mysqli/tests/028.phpt
+++ b/ext/mysqli/tests/028.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);

diff --git a/ext/mysqli/tests/029.phpt b/ext/mysqli/tests/029.phpt
index bfc54bcc61c8b92a9dce0707afbba6a6426b02d5..936420649d2ed7e193fe0b76cae7223fb04fdfac 100644 (file)
--- a/ext/mysqli/tests/029.phpt
+++ b/ext/mysqli/tests/029.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -28,7 +28,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/030.phpt b/ext/mysqli/tests/030.phpt
index 656946fb62b8fc2bc87738d8e510e243a1597e0c..c4b17104392c9e30d65954cfcfde001ea6714938 100644 (file)
--- a/ext/mysqli/tests/030.phpt
+++ b/ext/mysqli/tests/030.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);

diff --git a/ext/mysqli/tests/031.phpt b/ext/mysqli/tests/031.phpt
index 9f632cb42a45ea2081ce1606e4c27094b089f0f4..9b8c720d3e523570b74b979cbb10ffba0292b387 100644 (file)
--- a/ext/mysqli/tests/031.phpt
+++ b/ext/mysqli/tests/031.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);

diff --git a/ext/mysqli/tests/032.phpt b/ext/mysqli/tests/032.phpt
index 386883d0e8d03c4b1192297ff2c671bc7f105490..5fcd5484d272cd589ff449a18db81c79b9e52ff2 100644 (file)
--- a/ext/mysqli/tests/032.phpt
+++ b/ext/mysqli/tests/032.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -28,7 +28,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/033.phpt b/ext/mysqli/tests/033.phpt
index ade0bb8329167151ca4b0ebd57e9e8d5a9a62a35..b499bd71a6f0ee40575bc5c3971080fe2bff710c 100644 (file)
--- a/ext/mysqli/tests/033.phpt
+++ b/ext/mysqli/tests/033.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);

diff --git a/ext/mysqli/tests/034.phpt b/ext/mysqli/tests/034.phpt
index cc415344c27f5bf817bca440bf387c109314d6aa..3fda5600804974c076c400ecf54aa5fa6abdc3c0 100644 (file)
--- a/ext/mysqli/tests/034.phpt
+++ b/ext/mysqli/tests/034.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);

diff --git a/ext/mysqli/tests/035.phpt b/ext/mysqli/tests/035.phpt
index 7b621aa22201afcc63b03c05dcbc22731f03f1b7..7b18e027b88475d7203478eebeffb46e33852f60 100644 (file)
--- a/ext/mysqli/tests/035.phpt
+++ b/ext/mysqli/tests/035.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);

diff --git a/ext/mysqli/tests/036.phpt b/ext/mysqli/tests/036.phpt
index 4e68b6c2a1858e4ebdb55e8610cd8d79f7cd6079..b0d259c3f4a03c02649a19f034eb6e5c20824ed1 100644 (file)
--- a/ext/mysqli/tests/036.phpt
+++ b/ext/mysqli/tests/036.phpt
@@ -11,7 +11,7 @@ function test: mysqli_insert_id()
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -44,7 +44,7 @@ function test: mysqli_insert_id()
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/037.phpt b/ext/mysqli/tests/037.phpt
index 856bdc69821ea2aa69de0480ab6baf74323e6ddb..03d5d5562cb0a096c7995385d4e15b9d75803b5b 100644 (file)
--- a/ext/mysqli/tests/037.phpt
+++ b/ext/mysqli/tests/037.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 --FILE--
 <?php
 
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -34,7 +34,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/038.phpt b/ext/mysqli/tests/038.phpt
index 7be16f4493ff05f8a8fff9179b99ca6d5f37973d..45b724ca3cde4c64986615a5e64a09162a4ceb72 100644 (file)
--- a/ext/mysqli/tests/038.phpt
+++ b/ext/mysqli/tests/038.phpt
@@ -7,8 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -35,7 +34,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/039.phpt b/ext/mysqli/tests/039.phpt
index 9ed7ef9ea1e99dd6df892357969ca337be503551..ae881e1d2d4941baff3c17a16bf98b9a016e0602 100644 (file)
--- a/ext/mysqli/tests/039.phpt
+++ b/ext/mysqli/tests/039.phpt
@@ -7,8 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);

diff --git a/ext/mysqli/tests/040.phpt b/ext/mysqli/tests/040.phpt
index 6b115166bdf7300740a5d2d0fb92ad49d23894bd..3e2888355087c9b58eee7996d590760cd2543ce5 100644 (file)
--- a/ext/mysqli/tests/040.phpt
+++ b/ext/mysqli/tests/040.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -33,7 +33,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/041.phpt b/ext/mysqli/tests/041.phpt
index aac91f86a2d4f5ce0a94f201df871a1603acee54..ec67e476ca202fb9272f4ef876e9cdff8b6f1be2 100644 (file)
--- a/ext/mysqli/tests/041.phpt
+++ b/ext/mysqli/tests/041.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 --FILE--
 <?php
 
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -24,7 +24,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/042.phpt b/ext/mysqli/tests/042.phpt
index 9d79f148cba8d7f43e724b4651de978f76ebf2ec..55da0cd82729f7d6e3f156e93452c69a2759ed41 100644 (file)
--- a/ext/mysqli/tests/042.phpt
+++ b/ext/mysqli/tests/042.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -50,7 +50,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/043.phpt b/ext/mysqli/tests/043.phpt
index 51b2a91ff6c80c9bdcdedb998d58c5eda6e213b2..5d060b9bbb289d0b03ffca2ab6a77f9ebe7a53fb 100644 (file)
--- a/ext/mysqli/tests/043.phpt
+++ b/ext/mysqli/tests/043.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -42,7 +42,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/044.phpt b/ext/mysqli/tests/044.phpt
index 9d227f49e5ce1734a667ba2fc3b4d5c10ececb9c..3ddae3e42046ecffd5ddb791268b4a59c1acaf61 100644 (file)
--- a/ext/mysqli/tests/044.phpt
+++ b/ext/mysqli/tests/044.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);

diff --git a/ext/mysqli/tests/045.phpt b/ext/mysqli/tests/045.phpt
index d5ee5ad2bc483c363751452ba81d2b76e1d44b68..0b1706002eb9a640f02154aae042f370947ad2fd 100644 (file)
--- a/ext/mysqli/tests/045.phpt
+++ b/ext/mysqli/tests/045.phpt
@@ -6,7 +6,7 @@ mysqli_bind_result (SHOW)
        require_once('skipifemb.inc');
        require_once('skipifconnectfailure.inc');
 
-       include "connect.inc";
+       require_once("connect.inc");
        $link = my_mysqli_connect($host, $user, $passwd);
 
        $stmt = mysqli_prepare($link, "SHOW VARIABLES LIKE 'port'");
@@ -20,7 +20,7 @@ mysqli_bind_result (SHOW)
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);

diff --git a/ext/mysqli/tests/046.phpt b/ext/mysqli/tests/046.phpt
index cf773921011a89ed6b79d5f70126478e3d84c722..18c86e31663d4f480cf82131529a78dbfd274028 100644 (file)
--- a/ext/mysqli/tests/046.phpt
+++ b/ext/mysqli/tests/046.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -36,7 +36,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/047.phpt b/ext/mysqli/tests/047.phpt
index 3401418e91a067b3001c8ced1547506b76796f3c..5a86857031edd1185128d8cda7e6162240f46878 100644 (file)
--- a/ext/mysqli/tests/047.phpt
+++ b/ext/mysqli/tests/047.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -47,7 +47,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/048.phpt b/ext/mysqli/tests/048.phpt
index 5ab60e5a5f586346dac59edaed0730ffa5e5eb75..afc092357762d696f87a54224b71ce1c23c922b1 100644 (file)
--- a/ext/mysqli/tests/048.phpt
+++ b/ext/mysqli/tests/048.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $mysql = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -42,7 +42,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/049.phpt b/ext/mysqli/tests/049.phpt
index eb977a8b697576264773c937f419b96d6fc159ad..c87f369487c3d56377223b75a97ab2e6ccd1941c 100644 (file)
--- a/ext/mysqli/tests/049.phpt
+++ b/ext/mysqli/tests/049.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $mysql = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);

diff --git a/ext/mysqli/tests/050.phpt b/ext/mysqli/tests/050.phpt
index ba668f0a84c259bff6dfe59b5e7698307bdbe130..4e750c9248e9863562118b523695d6a521e34233 100644 (file)
--- a/ext/mysqli/tests/050.phpt
+++ b/ext/mysqli/tests/050.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /************************
         * non freed stamement

diff --git a/ext/mysqli/tests/051.phpt b/ext/mysqli/tests/051.phpt
index 82665156dbec4c7cfe39a85ea525ece83b2cbc88..ac85410bb3db8fa60c1ec26ffc061381e8f2f580 100644 (file)
--- a/ext/mysqli/tests/051.phpt
+++ b/ext/mysqli/tests/051.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /************************
         * free statement after close

diff --git a/ext/mysqli/tests/052.phpt b/ext/mysqli/tests/052.phpt
index f280d8406184f2609f0d414fdc6e6661f90510d1..89336ade6039ed8236f9d2d810e510e48903b37d 100644 (file)
--- a/ext/mysqli/tests/052.phpt
+++ b/ext/mysqli/tests/052.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /************************
         * statement call  after close

diff --git a/ext/mysqli/tests/053.phpt b/ext/mysqli/tests/053.phpt
index e0bbcbeee36fba87f78b518c41b6546fa57381c8..a1840c972645eb16324022baf003f5af06a490bc 100644 (file)
--- a/ext/mysqli/tests/053.phpt
+++ b/ext/mysqli/tests/053.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /************************
         * non freed resultset

diff --git a/ext/mysqli/tests/054.phpt b/ext/mysqli/tests/054.phpt
index 2d957cb3cc05fb4077f79b5e4817a2e3971bb1f0..6bd45a7c4bc08a180546b3552f3ad7f0137065dc 100644 (file)
--- a/ext/mysqli/tests/054.phpt
+++ b/ext/mysqli/tests/054.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /************************
         * free resultset after close

diff --git a/ext/mysqli/tests/055.phpt b/ext/mysqli/tests/055.phpt
index 1f0461bb24acb4ad2e67c98be768fb52c695509a..c73266e74809a957b36ef6f98e42a226728e3f4a 100644 (file)
--- a/ext/mysqli/tests/055.phpt
+++ b/ext/mysqli/tests/055.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /************************
         * don't free anything

diff --git a/ext/mysqli/tests/056.phpt b/ext/mysqli/tests/056.phpt
index f5571aca6249edee29c9628506d23c8094f52f04..413e678987980975e020699a102f1712c6179c55 100644 (file)
--- a/ext/mysqli/tests/056.phpt
+++ b/ext/mysqli/tests/056.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        class foobar extends mysqli {
                function test () {

diff --git a/ext/mysqli/tests/057.phpt b/ext/mysqli/tests/057.phpt
index 9da9a10149b94f1444a0047e6a2cceb3733d6c75..92f82d4e1abc55be506feeb7ab6bf78e428c9f16 100644 (file)
--- a/ext/mysqli/tests/057.phpt
+++ b/ext/mysqli/tests/057.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -64,7 +64,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/058.phpt b/ext/mysqli/tests/058.phpt
index d1a90a00410e84c5911281e80aa47daa2bac0ffb..a8312617c70f455988afe465cec7b44815be2518 100644 (file)
--- a/ext/mysqli/tests/058.phpt
+++ b/ext/mysqli/tests/058.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -50,7 +50,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/059.phpt b/ext/mysqli/tests/059.phpt
index 4897981cf44fbbab4a748ce3d7114c6eac60f1f9..733a3cefba5fde796d572c4d85e38433ad67ef6c 100644 (file)
--- a/ext/mysqli/tests/059.phpt
+++ b/ext/mysqli/tests/059.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -43,7 +43,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/060.phpt b/ext/mysqli/tests/060.phpt
index f1c20bfa1d0260c5b7747ff483257fc2420a8894..5d17f8f9535853176dadece1107ee895de76474c 100644 (file)
--- a/ext/mysqli/tests/060.phpt
+++ b/ext/mysqli/tests/060.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        class test_class {
                function __construct($arg1, $arg2) {
@@ -44,7 +44,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/061.phpt b/ext/mysqli/tests/061.phpt
index e40f3a273afdfb1f6ea06e6aab0f3168a9ecb521..08b4cda2519c210d48aa10ae2b8478efca52e792 100644 (file)
--- a/ext/mysqli/tests/061.phpt
+++ b/ext/mysqli/tests/061.phpt
@@ -9,7 +9,7 @@ if (!function_exists('mysqli_set_local_infile_handler'))
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        function my_read($fp, &$buffer, $buflen, &$error) {
                $buffer = strrev(fread($fp, $buflen));
@@ -51,7 +51,7 @@ if (!function_exists('mysqli_set_local_infile_handler'))
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/062.phpt b/ext/mysqli/tests/062.phpt
index 04385536512f1f993dc377e71ff615b47d0fd77d..bc6198c6a1bb9f04faebec0fa832b42635a01d1c 100644 (file)
--- a/ext/mysqli/tests/062.phpt
+++ b/ext/mysqli/tests/062.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 

diff --git a/ext/mysqli/tests/063.phpt b/ext/mysqli/tests/063.phpt
index 9b42ab7fbf5c1fd89a8cbcfe86b29780088783f5..b184d72eea0012fcf79ab741a4b9d0e613465cff 100644 (file)
--- a/ext/mysqli/tests/063.phpt
+++ b/ext/mysqli/tests/063.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 

diff --git a/ext/mysqli/tests/064.phpt b/ext/mysqli/tests/064.phpt
index a308e4ab29b738a230093bdf2324d0752b776dc1..46af7a6628fbf3851206a5032bdd93e53c424fc3 100644 (file)
--- a/ext/mysqli/tests/064.phpt
+++ b/ext/mysqli/tests/064.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 

diff --git a/ext/mysqli/tests/065.phpt b/ext/mysqli/tests/065.phpt
index d0f1d16291748a1b0cb5dfc199f6cb48610b1da7..172cecde3c2c9544ce00ac9c9ff79156872af797 100644 (file)
--- a/ext/mysqli/tests/065.phpt
+++ b/ext/mysqli/tests/065.phpt
@@ -14,7 +14,7 @@ if (version_compare(PHP_VERSION, '5.9.9', '>') == 1) {
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        if (!$mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket))
                printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());

diff --git a/ext/mysqli/tests/066.phpt b/ext/mysqli/tests/066.phpt
index 7581876ca46f33f5c58375e4f3c4fa72d39bf3cb..91dfce5073e7cdd3f8e05af502e2b4eb82a4c936 100644 (file)
--- a/ext/mysqli/tests/066.phpt
+++ b/ext/mysqli/tests/066.phpt
@@ -7,8 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-
-       include "connect.inc";
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
@@ -30,7 +29,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/067.phpt b/ext/mysqli/tests/067.phpt
index f571495185270e79ccab9ca57acc19898e1e92c9..d5795bdee8d1ca8dbb58df1cec4f4ed12612bb0d 100644 (file)
--- a/ext/mysqli/tests/067.phpt
+++ b/ext/mysqli/tests/067.phpt
@@ -4,7 +4,7 @@ function test: nested selects (cursors)
 <?php
        require_once('skipif.inc');
        require_once('skipifconnectfailure.inc');
-       include "connect.inc";
+       require_once("connect.inc");
 
        if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
                die("skip Cannot connect to check required version");
@@ -29,7 +29,7 @@ function test: nested selects (cursors)
                return $stmt;
        }
 
-       include "connect.inc";
+       require_once("connect.inc");
        $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 
        if ((!$IS_MYSQLND && mysqli_get_client_version() < 50009) ||
@@ -66,7 +66,7 @@ function test: nested selects (cursors)
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/069.phpt b/ext/mysqli/tests/069.phpt
index 404b6ab106409c1348a28d923cb579a70140790c..ee76ca5c1095928d016e2b404f73b95e898bc239 100644 (file)
--- a/ext/mysqli/tests/069.phpt
+++ b/ext/mysqli/tests/069.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
        $mysql->multi_query('SELECT 1;SELECT 2');

diff --git a/ext/mysqli/tests/070.phpt b/ext/mysqli/tests/070.phpt
index eee5125133f819c4ab24482da9e041e0a4192665..b71d9b2e49ada3c5e23fb702a768f8bf97645c1f 100644 (file)
--- a/ext/mysqli/tests/070.phpt
+++ b/ext/mysqli/tests/070.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
        var_dump($mysql->ping());

diff --git a/ext/mysqli/tests/071.phpt b/ext/mysqli/tests/071.phpt
index 8888fb1706414113c4a8f108ee4f0c6d1e4cd0a7..4788a6091385895315cf0a8fb812503ab9d4190d 100644 (file)
--- a/ext/mysqli/tests/071.phpt
+++ b/ext/mysqli/tests/071.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 

diff --git a/ext/mysqli/tests/072.phpt b/ext/mysqli/tests/072.phpt
index 637014b29cede2fcd222f99fdd498208b06962d4..036253a0b1eec497c7f872ff62969b0a56a1a6ed 100644 (file)
--- a/ext/mysqli/tests/072.phpt
+++ b/ext/mysqli/tests/072.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 

diff --git a/ext/mysqli/tests/073.phpt b/ext/mysqli/tests/073.phpt
index 7428bc3710cae5048ac2efbddab358800588c0f2..c70f7d94713e9b7a8bf10f6c763b4050d8393a8f 100644 (file)
--- a/ext/mysqli/tests/073.phpt
+++ b/ext/mysqli/tests/073.phpt
@@ -4,7 +4,7 @@ mysqli_driver properties
 <?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        var_dump($driver->embedded);
        var_dump($driver->client_version);

diff --git a/ext/mysqli/tests/074.phpt b/ext/mysqli/tests/074.phpt
index 883655bc5e579a726b5c8abd926288da75fe7524..7d9d01b3be404d32d785ac6e6a4c938470cd1380 100644 (file)
--- a/ext/mysqli/tests/074.phpt
+++ b/ext/mysqli/tests/074.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 --FILE--
 <?php
 
-       include "connect.inc";
+       require_once("connect.inc");
 
        $mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 

diff --git a/ext/mysqli/tests/bug28817.phpt b/ext/mysqli/tests/bug28817.phpt
index e5fa7d563c8439e6f442a2bf237b17d940d1405a..254c0e50dedb08e71a9bca60878011c178f2ac17 100644 (file)
--- a/ext/mysqli/tests/bug28817.phpt
+++ b/ext/mysqli/tests/bug28817.phpt
@@ -1,14 +1,14 @@
 --TEST--
 Bug #28817 (problems with properties declared in the class extending MySQLi)
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
-       
+       require_once("connect.inc");
+
        class my_mysql extends mysqli {
                public $p_test;
 

diff --git a/ext/mysqli/tests/bug29311.phpt b/ext/mysqli/tests/bug29311.phpt
index 83b18388c4f708846a84b30cf0307d5cd7185df3..cd7b9ef00950a3c57cfd6fc90679649db5dd601f 100644 (file)
--- a/ext/mysqli/tests/bug29311.phpt
+++ b/ext/mysqli/tests/bug29311.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        /* class 1 calls parent constructor */
        class mysql1 extends mysqli {

diff --git a/ext/mysqli/tests/bug30967.phpt b/ext/mysqli/tests/bug30967.phpt
index 8051acbdb3e18531a32686f546497b595c3d43c0..48007cee6c50f6feb0d0e4191d023742be23d230 100644 (file)
--- a/ext/mysqli/tests/bug30967.phpt
+++ b/ext/mysqli/tests/bug30967.phpt
@@ -1,14 +1,14 @@
 --TEST--
 Bug #30967 (problems with properties declared in the class extending the class extending MySQLi)
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
-       
+       require_once("connect.inc");
+
        class mysql1 extends mysqli {
        }
 

diff --git a/ext/mysqli/tests/bug31668.phpt b/ext/mysqli/tests/bug31668.phpt
index cdca551f2103f06e110bd7e70bdf0c9732a00ff6..9b769a1bae2f4df9e29572720432c38755647896 100644 (file)
--- a/ext/mysqli/tests/bug31668.phpt
+++ b/ext/mysqli/tests/bug31668.phpt
@@ -9,7 +9,7 @@ require_once('skipifconnectfailure.inc');
 error_reporting = E_ALL & ~E_STRICT
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
        $mysql->multi_query('SELECT 1;SELECT 2');

diff --git a/ext/mysqli/tests/bug32405.phpt b/ext/mysqli/tests/bug32405.phpt
index 24bcdb4d0f446c9f7a40e584b1c5712a9a75698a..0b3cad50ffd50b46a35431ddab95186483a98ac6 100644 (file)
--- a/ext/mysqli/tests/bug32405.phpt
+++ b/ext/mysqli/tests/bug32405.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include ("connect.inc");
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -33,7 +33,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/bug33263.phpt b/ext/mysqli/tests/bug33263.phpt
index 4f2a37c865ddcc950bd13d9f6a15ea603a38e42d..ac2de197bb81fae45a38a87abda9d2212a53dcd8 100644 (file)
--- a/ext/mysqli/tests/bug33263.phpt
+++ b/ext/mysqli/tests/bug33263.phpt
@@ -8,8 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-
-       include "connect.inc";
+       require_once("connect.inc");
 
        class test extends mysqli
        {

diff --git a/ext/mysqli/tests/bug34810.phpt b/ext/mysqli/tests/bug34810.phpt
index fac805312ac6a7702e81f6cfc4b86d8cb2932fd3..19a7e589bbf2583a6e9ae3e338aa0c9e15556d76 100644 (file)
--- a/ext/mysqli/tests/bug34810.phpt
+++ b/ext/mysqli/tests/bug34810.phpt
@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 
 class DbConnection {
        public function connect() {
-               include "connect.inc";
+               require_once("connect.inc");
 
                $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
                var_dump($link);
@@ -35,7 +35,7 @@ echo "Done\n";
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/bug35103.phpt b/ext/mysqli/tests/bug35103.phpt
index 9c137b5543f4eb7e3590802b530280cbe9ceead9..fc3cad04c26d49124ad3f3906d2f7f6b6d544e31 100644 (file)
--- a/ext/mysqli/tests/bug35103.phpt
+++ b/ext/mysqli/tests/bug35103.phpt
@@ -12,7 +12,7 @@ $drop = <<<EOSQL
 DROP TABLE test_bint;
 DROP TABLE test_buint;
 EOSQL;
-       include "connect.inc";
+       require_once("connect.inc");
 
        $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
        $mysql->query("DROP TABLE IF EXISTS test_bint");
@@ -53,7 +53,7 @@ EOSQL;
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/bug35517.phpt b/ext/mysqli/tests/bug35517.phpt
index c769eed1f13c0f553745251af5d07dc4a77146f0..746251f97cff4958de759f0400fbbc836b5a2842 100644 (file)
--- a/ext/mysqli/tests/bug35517.phpt
+++ b/ext/mysqli/tests/bug35517.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 
@@ -39,7 +39,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/bug35759.phpt b/ext/mysqli/tests/bug35759.phpt
index 39b21c476e74b80b249344c53dd88dbb4adef6aa..cbceb3b42e3fa9336143715baa1b27e91be54a91 100644 (file)
--- a/ext/mysqli/tests/bug35759.phpt
+++ b/ext/mysqli/tests/bug35759.phpt
@@ -14,7 +14,7 @@ CREATE TABLE blobby (
 
 
 EOSQL;
-       include "connect.inc";
+       require_once("connect.inc");
        $col_num= 1000;
 
        $mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
@@ -47,7 +47,7 @@ EOSQL;
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/bug36420.phpt b/ext/mysqli/tests/bug36420.phpt
index 54657a70011020981ce56ebf43f89312a1b0c73d..6dd03b37f033b2b27e4b214ff330e5699c2dd7ea 100644 (file)
--- a/ext/mysqli/tests/bug36420.phpt
+++ b/ext/mysqli/tests/bug36420.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 --FILE--
 <?php
 
-include "connect.inc";
+require_once("connect.inc");
 $mysqli = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 $result = $mysqli->query('select 1');

diff --git a/ext/mysqli/tests/bug36745.phpt b/ext/mysqli/tests/bug36745.phpt
index 511eaf38fdeab208ef1108d9e5a7a5e85815bae7..5e203e14eb40e77ea544dfb7c9fe58a79d937a1f 100644 (file)
--- a/ext/mysqli/tests/bug36745.phpt
+++ b/ext/mysqli/tests/bug36745.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include ("connect.inc");
+       require_once("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
        $mysql = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -23,7 +23,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/bug36802.phpt b/ext/mysqli/tests/bug36802.phpt
index d7144bddad2ebe997d368d2134e3a3ba22135e1c..3694a26db3376cf29c237506c7167d4aaeeb5864 100644 (file)
--- a/ext/mysqli/tests/bug36802.phpt
+++ b/ext/mysqli/tests/bug36802.phpt
@@ -10,7 +10,7 @@ Bug #36802 (crashes with with mysqli_set_charset())
                }
        }
 
-       include "connect.inc";
+       require_once("connect.inc");
        $mysql = mysqli_init();
 
        /* following operations should not work */

diff --git a/ext/mysqli/tests/bug36949.phpt b/ext/mysqli/tests/bug36949.phpt
index 39909f9efd04750a88d793538134a8294e2f7b3f..2b3cc4955b02f43d551b936a4f0db6e34d2d7f1d 100644 (file)
--- a/ext/mysqli/tests/bug36949.phpt
+++ b/ext/mysqli/tests/bug36949.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 class A {
 
        private $mysqli;
@@ -49,7 +49,7 @@ $B = new B();
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/bug37090.phpt b/ext/mysqli/tests/bug37090.phpt
index 7e8b4931b2fe49212f657fb97f4b42323e59927f..839081df5377e90f2510b56fb8fb96bfc90a862f 100644 (file)
--- a/ext/mysqli/tests/bug37090.phpt
+++ b/ext/mysqli/tests/bug37090.phpt
@@ -13,7 +13,7 @@ if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1)) {
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 

diff --git a/ext/mysqli/tests/bug38710.phpt b/ext/mysqli/tests/bug38710.phpt
index 280a51a6fcae9b8e2fa961a04ef87069bcb3d443..c3bb7285c8e314504440ee3d19065f1e5c966f59 100755 (executable)
--- a/ext/mysqli/tests/bug38710.phpt
+++ b/ext/mysqli/tests/bug38710.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 
 $db = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 $qry=$db->stmt_init();

diff --git a/ext/mysqli/tests/bug39457.phpt b/ext/mysqli/tests/bug39457.phpt
index b834ff1b70fc6bbeb04ac3a28690d54fbe77f7d1..ec9239bb15af3745ac401b92c585baf0362868a7 100644 (file)
--- a/ext/mysqli/tests/bug39457.phpt
+++ b/ext/mysqli/tests/bug39457.phpt
@@ -1,13 +1,13 @@
 --TEST--
 Bug #39457 (Multiple invoked OO connections never close)
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $mysql = mysqli_init();
        $mysql->connect($host, $user, $passwd, $db, $port, $socket);

diff --git a/ext/mysqli/tests/bug42548.phpt b/ext/mysqli/tests/bug42548.phpt
index c9950be3a169698da2fc809a574a853e23a74570..ef0c831e4da00d86fad459a1c128ec3ed7321242 100644 (file)
--- a/ext/mysqli/tests/bug42548.phpt
+++ b/ext/mysqli/tests/bug42548.phpt
@@ -52,7 +52,7 @@ print "done!";
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/bug44897.phpt b/ext/mysqli/tests/bug44897.phpt
index 92fc0a2e27ca53de0c2e6bc089682f512a46fac9..84c245d0fc734ba7c7b6cf21e6c14f8bb348d13b 100644 (file)
--- a/ext/mysqli/tests/bug44897.phpt
+++ b/ext/mysqli/tests/bug44897.phpt
@@ -19,7 +19,6 @@ if (mysqli_get_server_version($link) <= 50000) {
 ?>
 --FILE--
 <?php
-       require_once("connect.inc");
        require_once("table.inc");
 
        if (!$link->query('DROP PROCEDURE IF EXISTS p'))
@@ -74,7 +73,7 @@ if (mysqli_get_server_version($link) <= 50000) {
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/bug46109.phpt b/ext/mysqli/tests/bug46109.phpt
index bbb2903ab6e38b1b567e919f326017cc759cd0e9..c377171b7b52e8fc8749eaa9e3692d0a4a52ad33 100644 (file)
--- a/ext/mysqli/tests/bug46109.phpt
+++ b/ext/mysqli/tests/bug46109.phpt
@@ -1,18 +1,18 @@
 --TEST--
 Bug #46109 (MySQLi::init - Memory leaks)
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $mysqli = new mysqli();
        $mysqli->init();
        $mysqli->init();
-       echo "done";    
+       echo "done";
 ?>
 --EXPECTF--
 done

diff --git a/ext/mysqli/tests/bug48909.phpt b/ext/mysqli/tests/bug48909.phpt
index 55c85a6860ec11a72329299817fdd6417913c730..81df544190fbdee142e855e4dafd3666e6234938 100644 (file)
--- a/ext/mysqli/tests/bug48909.phpt
+++ b/ext/mysqli/tests/bug48909.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        if (!($link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)))
                printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",

diff --git a/ext/mysqli/tests/connect.inc b/ext/mysqli/tests/connect.inc
index ad2428647c85473c5e66534ed1a08317198bde0d..48ba893cccafcc37dc5f5d07ae310b42426faf6e 100644 (file)
--- a/ext/mysqli/tests/connect.inc
+++ b/ext/mysqli/tests/connect.inc
@@ -74,53 +74,58 @@
                }
        }
 
-       /**
-       * Whenever possible, please use this wrapper to make testing ot MYSQLI_CLIENT_COMPRESS (and potentially SSL) possible
-       *
-       * @param enable_env_flags Enable setting of connection flags through env(MYSQL_TEST_CONNECT_FLAGS)?
-       */
-       function my_mysqli_connect($host, $user, $passwd, $db, $port, $socket, $enable_env_flags = true) {
-               global $connect_flags;
+       if (!function_exists('my_mysqli_connect')) {
 
-               $flags = ($enable_env_flags) ? $connect_flags : false;
+               /**
+               * Whenever possible, please use this wrapper to make testing ot MYSQLI_CLIENT_COMPRESS (and potentially SSL) possible
+               *
+               * @param enable_env_flags Enable setting of connection flags through    env(MYSQL_TEST_CONNECT_FLAGS)?
+               */
+               function my_mysqli_connect($host, $user, $passwd, $db, $port, $socket, $enable_env_flags = true) {
+                       global $connect_flags;
 
-               if ($flags !== false) {
-                       $link = mysqli_init();
-                       if (!mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket, $flags))
-                               $link = false;
-               } else {
-                       $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
-               }
+                       $flags = ($enable_env_flags) ? $connect_flags : false;
 
-               return $link;
-       }
+                       if ($flags !== false) {
+                               $link = mysqli_init();
+                               if (!mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket, $flags))
+                                       $link = false;
+                       } else {
+                               $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+                       }
 
-       /**
-       * Whenever possible, please use this wrapper to make testing ot MYSQLI_CLIENT_COMPRESS (and potentially SSL) possible
-       *
-       * @param enable_env_flags Enable setting of connection flags through env(MYSQL_TEST_CONNECT_FLAGS)
-       */
-       function my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket, $flags = 0, $enable_env_flags = true) {
-               global $connect_flags;
+                       return $link;
+               }
 
-               if ($enable_env_flags)
-                       $flags & $connect_flags;
+               /**
+               * Whenever possible, please use this wrapper to make testing ot MYSQLI_CLIENT_COMPRESS (and potentially SSL) possible
+               *
+               * @param enable_env_flags Enable setting of connection flags through env(MYSQL_TEST_CONNECT_FLAGS)
+               */
+               function my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket, $flags = 0, $enable_env_flags = true) {
+                       global $connect_flags;
 
-               return mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket, $flags);
-       }
+                       if ($enable_env_flags)
+                               $flags & $connect_flags;
 
-       class my_mysqli extends mysqli {
-               public function __construct($host, $user, $passwd, $db, $port, $socket, $enable_env_flags = true) {
-                       global $connect_flags;
+                       return mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket, $flags);
+               }
 
-                       $flags = ($enable_env_flags) ? $connect_flags : false;
+               class my_mysqli extends mysqli {
+                       public function __construct($host, $user, $passwd, $db, $port, $socket, $enable_env_flags = true) {
+                               global $connect_flags;
 
-                       if ($flags !== false) {
-                               parent::init();
-                               $this->real_connect($host, $user, $passwd, $db, $port, $socket, $flags);
-                       } else {
-                               parent::__construct($host, $user, $passwd, $db, $port, $socket);
+                               $flags = ($enable_env_flags) ? $connect_flags : false;
+
+                               if ($flags !== false) {
+                                       parent::init();
+                                       $this->real_connect($host, $user, $passwd, $db, $port, $socket, $flags);
+                               } else {
+                                       parent::__construct($host, $user, $passwd, $db, $port, $socket);
+                               }
                        }
                }
+       } else {
+               printf("skip Eeeek/BUG/FIXME - connect.inc included twice! skipif bug?\n");
        }
 ?>
\ 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 6cb5451c0b1e5692bbcd425409af73230bd00120..958b83cb3cb06b7a2ef543f735f8cd2c381e6f51 100644 (file)
--- a/ext/mysqli/tests/mysqli_affected_rows.phpt
+++ b/ext/mysqli/tests/mysqli_affected_rows.phpt
@@ -8,7 +8,7 @@ mysqli_affected_rows()
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_affected_rows_oo.phpt b/ext/mysqli/tests/mysqli_affected_rows_oo.phpt
index 07b7bcb4866a658dd77bd044abbb794587e7d44b..6da026bc5ab246f9819b9d1c0b921a6b48940116 100644 (file)
--- a/ext/mysqli/tests/mysqli_affected_rows_oo.phpt
+++ b/ext/mysqli/tests/mysqli_affected_rows_oo.phpt
@@ -8,7 +8,7 @@ mysqli->affected_rows
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $mysqli = new mysqli();
        if (NULL !== ($tmp = @$mysqli->affected_rows))

diff --git a/ext/mysqli/tests/mysqli_autocommit.phpt b/ext/mysqli/tests/mysqli_autocommit.phpt
index cdd5559767e9e1dcafd90e4edae6158e6c627b3a..f1f63e7f33305363e5f6df540ee10b7078404a05 100644 (file)
--- a/ext/mysqli/tests/mysqli_autocommit.phpt
+++ b/ext/mysqli/tests/mysqli_autocommit.phpt
@@ -26,7 +26,7 @@ mysqli_autocommit()
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_autocommit_oo.phpt b/ext/mysqli/tests/mysqli_autocommit_oo.phpt
index 8f2c4b472fb2dc7b4b47ff3afef0321f31c7e297..b1777b9f6a510504d7b498c696679cba73709763 100644 (file)
--- a/ext/mysqli/tests/mysqli_autocommit_oo.phpt
+++ b/ext/mysqli/tests/mysqli_autocommit_oo.phpt
@@ -29,7 +29,7 @@ mysqli->autocommit()
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) {
                printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",

diff --git a/ext/mysqli/tests/mysqli_change_user.phpt b/ext/mysqli/tests/mysqli_change_user.phpt
index d889ec8202ee7a591cd6a59a1ae6ef14f379186f..b699229ceb9e7741410d1878c395a4336df1bf22 100644 (file)
--- a/ext/mysqli/tests/mysqli_change_user.phpt
+++ b/ext/mysqli/tests/mysqli_change_user.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_character_set.phpt b/ext/mysqli/tests/mysqli_character_set.phpt
index 11c92ce63e3f88b033d725c6ab6e9fb1a2a8026d..1fced9a3c454a7d8fd297bd632095dae3db4b959 100644 (file)
--- a/ext/mysqli/tests/mysqli_character_set.phpt
+++ b/ext/mysqli/tests/mysqli_character_set.phpt
@@ -16,7 +16,7 @@ if (version_compare(PHP_VERSION, '5.9.9', '>') == 1) {
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_character_set_name.phpt b/ext/mysqli/tests/mysqli_character_set_name.phpt
index 9a40099fe13044bc8b92f752aef1b250e26cf882..3fa997b50d575e203b186407bdc299413fe5c867 100644 (file)
--- a/ext/mysqli/tests/mysqli_character_set_name.phpt
+++ b/ext/mysqli/tests/mysqli_character_set_name.phpt
@@ -9,7 +9,7 @@ require_once('skipifconnectfailure.inc');
 --FILE--
 <?php
        /* NOTE: http://bugs.mysql.com/bug.php?id=7923 makes this test fail very likely on all 4.1.x - 5.0.x! */
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_character_set_name_oo.phpt b/ext/mysqli/tests/mysqli_character_set_name_oo.phpt
index a56cf6ae8dd8c2bcc3a5918bc0fa0c4957e0735d..43a83bbcb713004de19b4a437279579ec70fc1c1 100644 (file)
--- a/ext/mysqli/tests/mysqli_character_set_name_oo.phpt
+++ b/ext/mysqli/tests/mysqli_character_set_name_oo.phpt
@@ -9,7 +9,7 @@ mysqli_chararcter_set_name(), mysql_client_encoding() [alias]
 --FILE--
 <?php
        /* NOTE: http://bugs.mysql.com/bug.php?id=7923 makes this test fail very likely on all 4.1.x - 5.0.x! */
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_close.phpt b/ext/mysqli/tests/mysqli_close.phpt
index 713c6e157e64376e914682dec59fb27f03995c77..c6ac92dd6092623819c67805a50761957e0f82d1 100644 (file)
--- a/ext/mysqli/tests/mysqli_close.phpt
+++ b/ext/mysqli/tests/mysqli_close.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_close_oo.phpt b/ext/mysqli/tests/mysqli_close_oo.phpt
index c3d6a93974db02e3e2fabe76e4151f58114d562d..be67f779a88393d0d4c669e9d346b3a286b6dcb9 100644 (file)
--- a/ext/mysqli/tests/mysqli_close_oo.phpt
+++ b/ext/mysqli/tests/mysqli_close_oo.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_commit.phpt b/ext/mysqli/tests/mysqli_commit.phpt
index 6a3c1e86c956e16cc7941b4dce712b957da484b5..66113b3a5f7532856321d8240b6808eb666b0808 100644 (file)
--- a/ext/mysqli/tests/mysqli_commit.phpt
+++ b/ext/mysqli/tests/mysqli_commit.phpt
@@ -25,7 +25,7 @@ if ($row[1] == "DISABLED" || $row[1] == "NO") {
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_commit_oo.phpt b/ext/mysqli/tests/mysqli_commit_oo.phpt
index 8d072999cb2f215cfd5a479db863f1ec8da5202a..fee7967392945cafef470cffb013091c1b2a5f33 100644 (file)
--- a/ext/mysqli/tests/mysqli_commit_oo.phpt
+++ b/ext/mysqli/tests/mysqli_commit_oo.phpt
@@ -24,7 +24,7 @@ if ($row[1] == "DISABLED" || $row[1] == "NO") {
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_connect.phpt b/ext/mysqli/tests/mysqli_connect.phpt
index dd2792f8118a4241263bd82fbaef307829d803b2..cf7c7bede87fd384c996f3169596615e6be1c2e8 100644 (file)
--- a/ext/mysqli/tests/mysqli_connect.phpt
+++ b/ext/mysqli/tests/mysqli_connect.phpt
@@ -5,7 +5,7 @@ mysqli_connect()
 <?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_connect_errno.phpt b/ext/mysqli/tests/mysqli_connect_errno.phpt
index b48a75ef8c0bf900fce6752acf1c94d39abf771e..a7f90f15272f1f494abc166a02f4b68e2c513916 100644 (file)
--- a/ext/mysqli/tests/mysqli_connect_errno.phpt
+++ b/ext/mysqli/tests/mysqli_connect_errno.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_connect_error.phpt b/ext/mysqli/tests/mysqli_connect_error.phpt
index e65dc0eb075b1573e112c3920617f4de0f7f8da0..dc4db6af58af68210b68e4eaf543095e85dd91f3 100644 (file)
--- a/ext/mysqli/tests/mysqli_connect_error.phpt
+++ b/ext/mysqli/tests/mysqli_connect_error.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_connect_oo.phpt b/ext/mysqli/tests/mysqli_connect_oo.phpt
index 63660fd2b633a5acceb5b8036a45b90f03c9a360..d406e24845d134abe7727ba6209c6a7bb21342e8 100644 (file)
--- a/ext/mysqli/tests/mysqli_connect_oo.phpt
+++ b/ext/mysqli/tests/mysqli_connect_oo.phpt
@@ -5,7 +5,7 @@ new mysqli()
 <?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
index ec5d1014c7e01a071b365438ed94658156553bcc..60f58fbf18aca07ac82bcebe7319676d6b974c56 100644 (file)
--- a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
+++ b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
@@ -5,7 +5,7 @@ new mysqli()
 <?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt b/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt
index 1c2defc8b06c827e66ba119438ffdf62150e71e9..5ede44591e29b07e5dfcaa1b9fc57bd8429540e5 100644 (file)
--- a/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt
+++ b/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt
@@ -12,7 +12,7 @@ new mysqli()
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $myhost = 'invalidhost';
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_connect_twice.phpt b/ext/mysqli/tests/mysqli_connect_twice.phpt
index 7c6a726b298e92624d588fe9b124c82c755f7a83..a9d5b7ec9478ea1bcbe750f1b79377cddff46939 100644 (file)
--- a/ext/mysqli/tests/mysqli_connect_twice.phpt
+++ b/ext/mysqli/tests/mysqli_connect_twice.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
                printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",

diff --git a/ext/mysqli/tests/mysqli_data_seek.phpt b/ext/mysqli/tests/mysqli_data_seek.phpt
index cb54c80033c65dba72e6ba4749b41cf3221c8a23..9e2d65047bdef45dd2325622494b2911818ac01b 100644 (file)
--- a/ext/mysqli/tests/mysqli_data_seek.phpt
+++ b/ext/mysqli/tests/mysqli_data_seek.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_data_seek_oo.phpt b/ext/mysqli/tests/mysqli_data_seek_oo.phpt
index e75a04f36ef0dbaa6647a0f70b52431038485989..0858218a464cf38b49138e77d6ce89a8fca1905c 100644 (file)
--- a/ext/mysqli/tests/mysqli_data_seek_oo.phpt
+++ b/ext/mysqli/tests/mysqli_data_seek_oo.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt b/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt
index 79f081f50f359f901bb899dc83a505e6577f1980..9814c6e255fbc0ec7ec63226b79e9506cedbfdbc 100644 (file)
--- a/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt
+++ b/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt
@@ -12,7 +12,7 @@ if (!function_exists('mysqli_disable_reads_from_master')) {
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_driver.phpt b/ext/mysqli/tests/mysqli_driver.phpt
index a2d1437a2a1ee9d51cd4b1dd0be19b01da38973c..4e266a0533e0f17f8bb9d6522e094b3df237b159 100644 (file)
--- a/ext/mysqli/tests/mysqli_driver.phpt
+++ b/ext/mysqli/tests/mysqli_driver.phpt
@@ -8,8 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
-       include "table.inc";
+       require("table.inc");
 
        if (!is_object($driver = new mysqli_driver()))
                printf("[001] Failed to create mysqli_driver object\n");

diff --git a/ext/mysqli/tests/mysqli_dump_debug_info.phpt b/ext/mysqli/tests/mysqli_dump_debug_info.phpt
index fe253e1cf70f23f75bf03e7c186f491f548bfad0..bd87ddf0c83b3a776b42921c435d3f95cab0b5c7 100644 (file)
--- a/ext/mysqli/tests/mysqli_dump_debug_info.phpt
+++ b/ext/mysqli/tests/mysqli_dump_debug_info.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_dump_debug_info_oo.phpt b/ext/mysqli/tests/mysqli_dump_debug_info_oo.phpt
index 1d334f95dfd6d3ca2b7b9ddc895bf70a9f7fd06d..82edef5619114340813a52be267439bd440c1513 100644 (file)
--- a/ext/mysqli/tests/mysqli_dump_debug_info_oo.phpt
+++ b/ext/mysqli/tests/mysqli_dump_debug_info_oo.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_embedded_connect.phpt b/ext/mysqli/tests/mysqli_embedded_connect.phpt
index 5ee5fa76a171ad89a273e375c2353695af23a5df..37891f55e680a700fc74c76d5b7c990ae7beb6cb 100644 (file)
--- a/ext/mysqli/tests/mysqli_embedded_connect.phpt
+++ b/ext/mysqli/tests/mysqli_embedded_connect.phpt
@@ -1,14 +1,14 @@
 --TEST--
 mysqli_embedded_connect()
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifnotemb.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
        $tmp    = NULL;
        $link   = NULL;
 

diff --git a/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt b/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt
index 171ed565056ef762f386a487df5ae2146066f114..e23ddd1671bcfa674ddddd2f023f1a8ad1b2c17e 100644 (file)
--- a/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt
+++ b/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt
@@ -12,7 +12,7 @@ if (!function_exists('mysqli_enable_reads_from_master')) {
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_errno.phpt b/ext/mysqli/tests/mysqli_errno.phpt
index 48acbb62353d150744f070af740b3791d595e870..0e9f0496af9eaa6eeaa75e35989ef5706dcd2985 100644 (file)
--- a/ext/mysqli/tests/mysqli_errno.phpt
+++ b/ext/mysqli/tests/mysqli_errno.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_errno_oo.phpt b/ext/mysqli/tests/mysqli_errno_oo.phpt
index 032f70a878d81341013478816a8a71d09e05e676..bef4a607ebb0387d4c851f0c89c2f24f91701f66 100644 (file)
--- a/ext/mysqli/tests/mysqli_errno_oo.phpt
+++ b/ext/mysqli/tests/mysqli_errno_oo.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_error.phpt b/ext/mysqli/tests/mysqli_error.phpt
index 51738804576b57e04cf84beaa8c4e6c311f8c314..5e70d59d415d7f0e0d959031842585c8e220d5c9 100644 (file)
--- a/ext/mysqli/tests/mysqli_error.phpt
+++ b/ext/mysqli/tests/mysqli_error.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_error_oo.phpt b/ext/mysqli/tests/mysqli_error_oo.phpt
index 456f8f9a35dcbd15b02d5553b1d2df20a5b4716c..31716d9aafcd5e2a687bbe1d55e13801866cf3c3 100644 (file)
--- a/ext/mysqli/tests/mysqli_error_oo.phpt
+++ b/ext/mysqli/tests/mysqli_error_oo.phpt
@@ -1,14 +1,14 @@
 --TEST--
 $mysqli->error
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_error_unicode.phpt b/ext/mysqli/tests/mysqli_error_unicode.phpt
index 8789f89e84647bdd3636e06c8b0625c6ae078b5a..b59ed5f601249684bff52cea1b850131ed3935ee 100644 (file)
--- a/ext/mysqli/tests/mysqli_error_unicode.phpt
+++ b/ext/mysqli/tests/mysqli_error_unicode.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_fetch_all.phpt b/ext/mysqli/tests/mysqli_fetch_all.phpt
index 26401e7cce71432fac9ebf9e9bb128a1dc2ed3ce..eacecc92d0d07ebec49ff1230131f06c1b587925 100644 (file)
--- a/ext/mysqli/tests/mysqli_fetch_all.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_all.phpt
@@ -10,7 +10,7 @@ if (!function_exists('mysqli_fetch_all'))
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_fetch_all_oo.phpt b/ext/mysqli/tests/mysqli_fetch_all_oo.phpt
index 297d92ac7da49d837b997052644afedd4cb04c2c..a71eb2bce28beb7c6c56720065839bbcd6d0bc37 100644 (file)
--- a/ext/mysqli/tests/mysqli_fetch_all_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_all_oo.phpt
@@ -11,7 +11,7 @@ if (!function_exists('mysqli_fetch_all'))
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_fetch_array.phpt b/ext/mysqli/tests/mysqli_fetch_array.phpt
index f43804d966153dd62ac954c82c968b191f455df1..cff3141661ebed3ed9a74813b9f614a2a163c7cd 100644 (file)
--- a/ext/mysqli/tests/mysqli_fetch_array.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_array.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
        $tmp    = NULL;
        $link   = NULL;
 

diff --git a/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt b/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt
index d85eb9e6ffecc4a6ee7a6e1b8524c360cdf0d18a..957ca12de93a2531307cca46757298e48f6cf4a6 100644 (file)
--- a/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt
@@ -8,7 +8,6 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
        require('table.inc');
 
        if (!$res = mysqli_query($link, "SELECT * FROM test ORDER BY id LIMIT 5")) {

diff --git a/ext/mysqli/tests/mysqli_fetch_array_large.phpt b/ext/mysqli/tests/mysqli_fetch_array_large.phpt
index aa8c76871585999a40dc592ff40a773a108684ea..b11f954774fea40f24e57809b0a5f01af3e70302 100644 (file)
--- a/ext/mysqli/tests/mysqli_fetch_array_large.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_array_large.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        function mysqli_fetch_array_large($offset, $link, $package_size) {
 

diff --git a/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt b/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt
index c9ed7ccac7e30077de23ce9c6d8cf85bb1a8919e..82e4d7b66656a377d3907620c476b139bf07bd64 100644 (file)
--- a/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt
@@ -8,7 +8,6 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
        require("table.inc");
 
        // do as much as we can do in 5 seconds

diff --git a/ext/mysqli/tests/mysqli_fetch_array_oo.phpt b/ext/mysqli/tests/mysqli_fetch_array_oo.phpt
index fcabb59030a0cc9e5e785415e6259e2b54347c38..78c21308f381741b5c2e414b0df908f36cc07987 100644 (file)
--- a/ext/mysqli/tests/mysqli_fetch_array_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_array_oo.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_fetch_assoc.phpt b/ext/mysqli/tests/mysqli_fetch_assoc.phpt
index 6aaed3eb1f10397878e0c44998162884d166e81b..edf143b7263aaf646750ebd1c1f88259ed3eb056 100644 (file)
--- a/ext/mysqli/tests/mysqli_fetch_assoc.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_assoc.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt
index fa60582c48fc3f0fd9acd07fb1aa738c9e4b8041..a273b73aa977cfcd16407f6b6bfd68e462cdc3ac 100644 (file)
--- a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt
@@ -8,7 +8,6 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
        require('table.inc');
 
        if (!$res = mysqli_query($link, "SELECT 1, 2")) {

diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt
index 18d60c4b67e201937c0c2f97f1e18d1ee40339fe..fa00ecda15d2350b2950b473e42dcf9b209ece10 100644 (file)
--- a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt
@@ -5,7 +5,7 @@ mysqli_fetch_assoc() - utf8
        require_once('skipif.inc');
        require_once('skipifemb.inc');
        require_once('skipifconnectfailure.inc');
-       require('connect.inc');
+       require_once("connect.inc");
 
        if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
                die("skip Cannot connect to server to check charsets");
@@ -35,7 +35,6 @@ mysqli_fetch_assoc() - utf8
 ?>
 --FILE--
 <?php
-       include "connect.inc";
        require('table.inc');
 
        /* some cyrillic (utf8) comes here */

diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt
index e9a746ec011fcfd9cd8e4cc8726e69415b3ea16d..8a71fa740ce3137af2b1818b4c486261d9715ce2 100644 (file)
--- a/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_fetch_field.phpt b/ext/mysqli/tests/mysqli_fetch_field.phpt
index dba9f2f557127ac30af21709e982fd1240f8fa38..e90599257ef586a4fc84bfa90ff564ed5a13e682 100644 (file)
--- a/ext/mysqli/tests/mysqli_fetch_field.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_field.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_fetch_field_direct.phpt b/ext/mysqli/tests/mysqli_fetch_field_direct.phpt
index 5b4dc56711cdfb12326e4ea7303e418ab001e4df..33c5a0cf30837a8bdd28927bd967bc304dc3f00b 100644 (file)
--- a/ext/mysqli/tests/mysqli_fetch_field_direct.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_field_direct.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt b/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt
index f1075139e3d8224ce60d89c8a3cd402ce8e867c4..23d46f3092245cf8e38aac979659dd47d841cc35 100644 (file)
--- a/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt
index 2a8b20b83ae42958539f52390fe4b04abaff646d..42cbc1487feb5bd90f28079bd619c496b627ad60 100644 (file)
--- a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt
@@ -17,7 +17,7 @@ mysqli_close($link);
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
 /* TODO: mysqli.c needs to export a few more constants - see all the defined() calls! */
 

diff --git a/ext/mysqli/tests/mysqli_fetch_field_oo.phpt b/ext/mysqli/tests/mysqli_fetch_field_oo.phpt
index 2c169ed3f09223032fc688307e073e0f05fce2c5..f7dcd9b9af3940679b5884360cfe0265e3e0989c 100644 (file)
--- a/ext/mysqli/tests/mysqli_fetch_field_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_field_oo.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_fetch_field_types.phpt b/ext/mysqli/tests/mysqli_fetch_field_types.phpt
index ae18f0ca63f9ed6ebf0192b4159fb8b4b31caba6..5d7e5ebc8d4083adbb6bc6d2f84998dddc253629 100644 (file)
--- a/ext/mysqli/tests/mysqli_fetch_field_types.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_field_types.phpt
@@ -8,7 +8,6 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
        require('table.inc');
 
        function mysqli_field_datatypes($link, $sql_type, $php_value, $php_type, $datatypes) {

diff --git a/ext/mysqli/tests/mysqli_fetch_fields.phpt b/ext/mysqli/tests/mysqli_fetch_fields.phpt
index 0acec5477c3f2eb99597cf96c874a607b79fb693..a87956de1144930be25115127e3b987c244e8db6 100644 (file)
--- a/ext/mysqli/tests/mysqli_fetch_fields.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_fields.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_fetch_lengths.phpt b/ext/mysqli/tests/mysqli_fetch_lengths.phpt
index 71c2349224ced2ce3bc30ea93e22c3a7a3243bcf..1abc61170e48b61f1c411f64f6e2ca7b084bc4d7 100644 (file)
--- a/ext/mysqli/tests/mysqli_fetch_lengths.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_lengths.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket))
                printf("[001] Cannot connect\n");

diff --git a/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt b/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt
index ef7d7622fdb701e5b71c8276c6c9e8c18d5a0bf7..7523621a34df62b06a15b5fd56c1bdd7f03e7c3d 100644 (file)
--- a/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket))
                printf("[001] Cannot connect\n");

diff --git a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt
index fc7efe4b2d54130102dd3027936137ee698db6e5..2fa80cfa94987cc851e1ca98d2658d16e74a526d 100644 (file)
--- a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt b/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt
index c76742226d9e601e8475dd1e33e9a5c59aaaa169..c8e2b8508eca717e1a6b8c91e1a0d206ee9dc8d7 100644 (file)
--- a/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt
@@ -8,7 +8,6 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
        require('table.inc');
        if (!$res = mysqli_query($link, "SELECT id AS ID, label FROM test AS TEST ORDER BY id LIMIT 5")) {
                printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));

diff --git a/ext/mysqli/tests/mysqli_fetch_object_oo.phpt b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt
index 10b39e2ecdfb1156771e146f7ca227764c630427..3b263e49e4a0e238b81c57406880d4c0667314ec 100644 (file)
--- a/ext/mysqli/tests/mysqli_fetch_object_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_fetch_row.phpt b/ext/mysqli/tests/mysqli_fetch_row.phpt
index bb44fd41898742d71892524371e73909262c630b..e0359e058e8fa76f43fb64320e8c4241d5270076 100644 (file)
--- a/ext/mysqli/tests/mysqli_fetch_row.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_row.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_field_count.phpt b/ext/mysqli/tests/mysqli_field_count.phpt
index 5c63b86f67e45626473d1ea651e8de6d47ddc501..9a778c94cb3b80f1d3a1a192b605ad9623b5d7e5 100644 (file)
--- a/ext/mysqli/tests/mysqli_field_count.phpt
+++ b/ext/mysqli/tests/mysqli_field_count.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_field_seek.phpt b/ext/mysqli/tests/mysqli_field_seek.phpt
index 9d17f1a75730edccf87801a163a40b6e070ca045..58692a620dd45497b8ea6bd66156693dd6920bfc 100644 (file)
--- a/ext/mysqli/tests/mysqli_field_seek.phpt
+++ b/ext/mysqli/tests/mysqli_field_seek.phpt
@@ -54,7 +54,7 @@ require_once('skipifconnectfailure.inc');
                return $ret;
        }
 
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_field_tell.phpt b/ext/mysqli/tests/mysqli_field_tell.phpt
index 9609a7c5dfc43379b32fb2a001ddf7ed6405ca25..f1e43c4912af6fb649a79e7e485c60cacd903aa0 100644 (file)
--- a/ext/mysqli/tests/mysqli_field_tell.phpt
+++ b/ext/mysqli/tests/mysqli_field_tell.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_fork.phpt b/ext/mysqli/tests/mysqli_fork.phpt
index 7e5aac928a669d2e40274ece2bb2617d1ddf348d..6c5096f37ab23309a58aa35b85b30c229cf9fd3c 100644 (file)
--- a/ext/mysqli/tests/mysqli_fork.phpt
+++ b/ext/mysqli/tests/mysqli_fork.phpt
@@ -32,7 +32,6 @@ if ($row[1] == "DISABLED" || $row[1] == "NO") {
 ?>
 --FILE--
 <?php
-       require_once("connect.inc");
        require_once("table.inc");
 
        $res = mysqli_query($link, "SELECT 'dumped by the parent' AS message");
@@ -236,7 +235,7 @@ if ($row[1] == "DISABLED" || $row[1] == "NO") {
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/mysqli_free_result.phpt b/ext/mysqli/tests/mysqli_free_result.phpt
index 1454353583307369226b7a22a39069f8c684132e..a065e1482178dab30fed4865449abf54df7603ca 100644 (file)
--- a/ext/mysqli/tests/mysqli_free_result.phpt
+++ b/ext/mysqli/tests/mysqli_free_result.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $db = 'test';
        $tmp    = NULL;

diff --git a/ext/mysqli/tests/mysqli_get_cache_stats.phpt b/ext/mysqli/tests/mysqli_get_cache_stats.phpt
index d49e399bbfb4e845b6a6c315d03ee906b5b8f1be..572be47be34bd5127c9b03aa122161182bf20eb2 100644 (file)
--- a/ext/mysqli/tests/mysqli_get_cache_stats.phpt
+++ b/ext/mysqli/tests/mysqli_get_cache_stats.phpt
@@ -20,7 +20,7 @@ if (!function_exists('mysqli_get_cache_stats')) {
        if (!is_null($tmp = @mysqli_get_cache_stats($link)))
                printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
 
-       include "connect.inc";
+       require_once("connect.inc");
 
        if (!is_array($info = mysqli_get_cache_stats()) || empty($info))
                printf("[002] Expecting array/any_non_empty, got %s/%s\n", gettype($info), $info);

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 0bb90fa71430d97531e373fbab424fccef0c3e52..643f8b140371d35f8fcf9d47682e1944d19d2ada 100644 (file)
--- a/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt
+++ b/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt
@@ -16,7 +16,6 @@ if (!function_exists('mysqli_get_cache_stats')) {
 ?>
 --FILE--
 <?php
-       include "connect.inc";
        require_once('table.inc');
 
        if (!is_array($info = mysqli_get_cache_stats()) || empty($info))
@@ -96,4 +95,4 @@ if (!function_exists('mysqli_get_cache_stats')) {
        require_once("clean_table.inc");
 ?>
 --EXPECTF--
-done!
\ No newline at end of file
+done!

diff --git a/ext/mysqli/tests/mysqli_get_charset.phpt b/ext/mysqli/tests/mysqli_get_charset.phpt
index 314853dc02385fc521e13f28d08fb283b0ae4369..8f81b3342eb31c8f9eb07772634a7c043c09433d 100644 (file)
--- a/ext/mysqli/tests/mysqli_get_charset.phpt
+++ b/ext/mysqli/tests/mysqli_get_charset.phpt
@@ -10,7 +10,7 @@ if (!function_exists('mysqli_get_charset'))
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_get_client_info.phpt b/ext/mysqli/tests/mysqli_get_client_info.phpt
index c927231aadc7a80b0c18c7c9a422931d0d2592dd..bb3f5cc1f19398f12ac7d190f80d16108ed970f4 100644 (file)
--- a/ext/mysqli/tests/mysqli_get_client_info.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_info.phpt
@@ -1,14 +1,14 @@
 --TEST--
 mysqli_get_client_info()
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
        if (!is_string($info = mysqli_get_client_info()) || ('' === $info))
                printf("[001] Expecting string/any_non_empty, got %s/%s\n", gettype($info), $info);
 

diff --git a/ext/mysqli/tests/mysqli_get_client_stats.phpt b/ext/mysqli/tests/mysqli_get_client_stats.phpt
index 8120117fb1e302fc6c21d11860e903a27c180a6d..da1012ab487dffe8d8e2b28b334951f4e990559e 100644 (file)
--- a/ext/mysqli/tests/mysqli_get_client_stats.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats.phpt
@@ -84,7 +84,7 @@ mysqlnd.collect_memory_statistics=1
        if (!is_null($tmp = @mysqli_get_client_stats($link)))
                printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
 
-       include "connect.inc";
+       require_once("connect.inc");
 
        if (!is_array($info = mysqli_get_client_stats()) || empty($info))
                printf("[002] Expecting array/any_non_empty, got %s/%s\n", gettype($info), $info);
@@ -862,7 +862,7 @@ mysqlnd.collect_memory_statistics=1
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/mysqli_get_connection_stats.phpt b/ext/mysqli/tests/mysqli_get_connection_stats.phpt
index 698a4684ff9c90d9df35efbfdaa1bca3d05ac879..64eba16679df058c5b6bfd16e901548cac4e4753 100644 (file)
--- a/ext/mysqli/tests/mysqli_get_connection_stats.phpt
+++ b/ext/mysqli/tests/mysqli_get_connection_stats.phpt
@@ -21,8 +21,7 @@ if (!function_exists('mysqli_get_connection_stats')) {
        if (!is_null($tmp = @mysqli_get_connection_stats($link)))
                printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
 
-       include "connect.inc";
-       include "table.inc";
+       require("table.inc");
 
        if (!is_array($info = mysqli_get_connection_stats($link)) || empty($info))
                printf("[003] Expecting array/any_non_empty, got %s/%s\n", gettype($info), $info);
@@ -63,7 +62,7 @@ if (!function_exists('mysqli_get_connection_stats')) {
        }
 
        mysqli_close($link);
-       include "table.inc";
+       require("table.inc");
 
        if (!is_array($info = mysqli_get_connection_stats($link)) || empty($info))
                printf("[008] Expecting array/any_non_empty, got %s/%s\n", gettype($info), $info);

diff --git a/ext/mysqli/tests/mysqli_get_host_info.phpt b/ext/mysqli/tests/mysqli_get_host_info.phpt
index b3db9be8dc7b64361606d8acdfadbf0d49b06dee..2c3c0f806d79b61d55091eda9ac2b6b200a219a1 100644 (file)
--- a/ext/mysqli/tests/mysqli_get_host_info.phpt
+++ b/ext/mysqli/tests/mysqli_get_host_info.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        if (!is_null($tmp = @mysqli_get_host_info()))
                printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);

diff --git a/ext/mysqli/tests/mysqli_get_proto_info.phpt b/ext/mysqli/tests/mysqli_get_proto_info.phpt
index b5dd9851812395611867fae336f6c81934e8c6a6..7fbefeb853591b8a5dbb586aa30caeca51a166cb 100644 (file)
--- a/ext/mysqli/tests/mysqli_get_proto_info.phpt
+++ b/ext/mysqli/tests/mysqli_get_proto_info.phpt
@@ -1,14 +1,14 @@
 --TEST--
 mysqli_get_proto_info()
 --SKIPIF--
-<?php 
+<?php
 require_once('skipif.inc');
-require_once('skipifemb.inc'); 
+require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        if (!is_null($tmp = @mysqli_get_proto_info()))
                printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);

diff --git a/ext/mysqli/tests/mysqli_get_server_info.phpt b/ext/mysqli/tests/mysqli_get_server_info.phpt
index f10cc4cfa9f24caaba13c3eff2eff6cc95218e0b..a7f785302b52f3d6fb016c28f2bc84da7d8afc90 100644 (file)
--- a/ext/mysqli/tests/mysqli_get_server_info.phpt
+++ b/ext/mysqli/tests/mysqli_get_server_info.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        if (!is_null($tmp = @mysqli_get_server_info()))
                printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);

diff --git a/ext/mysqli/tests/mysqli_get_server_version.phpt b/ext/mysqli/tests/mysqli_get_server_version.phpt
index a97c9a23b25902ca1785616bb288d4a49b5eef52..b30c4a3801f8c93500c2684d92620588b11a3ec5 100644 (file)
--- a/ext/mysqli/tests/mysqli_get_server_version.phpt
+++ b/ext/mysqli/tests/mysqli_get_server_version.phpt
@@ -1,14 +1,14 @@
 --TEST--
 mysqli_get_server_version()
 --SKIPIF--
-<?php 
+<?php
 require_once('skipif.inc');
 require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        if (!is_null($tmp = @mysqli_get_server_version()))
                printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);

diff --git a/ext/mysqli/tests/mysqli_get_warnings.phpt b/ext/mysqli/tests/mysqli_get_warnings.phpt
index 1472f297f3e645b349f39d74bfc652ed9358b6d1..00548de709397ddb8983304aa6519eebfcae5019 100644 (file)
--- a/ext/mysqli/tests/mysqli_get_warnings.phpt
+++ b/ext/mysqli/tests/mysqli_get_warnings.phpt
@@ -11,7 +11,7 @@ if (!$TEST_EXPERIMENTAL)
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;
@@ -144,7 +144,7 @@ if (!$TEST_EXPERIMENTAL)
        print "done!";
 ?>
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/mysqli_info.phpt b/ext/mysqli/tests/mysqli_info.phpt
index caa7c9010353c525183bb24db7a9d981fbe6e345..2d5004fe6e38ede87160be1ab02bf9b894117a73 100644 (file)
--- a/ext/mysqli/tests/mysqli_info.phpt
+++ b/ext/mysqli/tests/mysqli_info.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        if (!is_null($tmp = @mysqli_info()))
                printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);

diff --git a/ext/mysqli/tests/mysqli_insert_id.phpt b/ext/mysqli/tests/mysqli_insert_id.phpt
index a5491bf9737b2868c1373b2033a47f765ff17bb1..549d71d1563dd5617d7249be73cb9be80c4a2292 100644 (file)
--- a/ext/mysqli/tests/mysqli_insert_id.phpt
+++ b/ext/mysqli/tests/mysqli_insert_id.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_insert_id_variation.phpt b/ext/mysqli/tests/mysqli_insert_id_variation.phpt
index 1717b309c1ad2ba357f9982d4c32aefeb6e5b90b..e858ca068956063c5f5a4f5a175c8b4cf0d07def 100644 (file)
--- a/ext/mysqli/tests/mysqli_insert_id_variation.phpt
+++ b/ext/mysqli/tests/mysqli_insert_id_variation.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
     printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
@@ -90,7 +90,7 @@ echo "DONE";
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/mysqli_kill.phpt b/ext/mysqli/tests/mysqli_kill.phpt
index 64daad88eb7f1655d4d495eac969e9f2fb2e5d16..f680a68137d7b28894db07c1cb5044547170427b 100644 (file)
--- a/ext/mysqli/tests/mysqli_kill.phpt
+++ b/ext/mysqli/tests/mysqli_kill.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_more_results.phpt b/ext/mysqli/tests/mysqli_more_results.phpt
index 49de0d7fadfa3ce4b7367f71f0986c393035caf9..271c63e1d19c60bda730b77c10cf9773aa3370f6 100644 (file)
--- a/ext/mysqli/tests/mysqli_more_results.phpt
+++ b/ext/mysqli/tests/mysqli_more_results.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $strict_on = false;
        if (defined('E_STRICT')) {

diff --git a/ext/mysqli/tests/mysqli_multi_query.phpt b/ext/mysqli/tests/mysqli_multi_query.phpt
index dd26fd71ba6e2db60d8e27a6a0b38eb5273ce6ef..91c07c256432d45574a96a1be14338179074db32 100644 (file)
--- a/ext/mysqli/tests/mysqli_multi_query.phpt
+++ b/ext/mysqli/tests/mysqli_multi_query.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $strict_on = false;
        if (defined('E_STRICT')) {

diff --git a/ext/mysqli/tests/mysqli_next_result.phpt b/ext/mysqli/tests/mysqli_next_result.phpt
index 0dc49c72f0ecf02cd025996da2f8a16fe795f2bd..c36920e1ecc85a7df3b85d823fa2cb2909ea1946 100644 (file)
--- a/ext/mysqli/tests/mysqli_next_result.phpt
+++ b/ext/mysqli/tests/mysqli_next_result.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $strict_on = false;
        if (defined('E_STRICT')) {

diff --git a/ext/mysqli/tests/mysqli_num_fields.phpt b/ext/mysqli/tests/mysqli_num_fields.phpt
index 88825573c1aa01fcc54c4d57a4b1dbc870da7ed2..4c2510af45022ba3a92ad061012cca1931b7fea6 100644 (file)
--- a/ext/mysqli/tests/mysqli_num_fields.phpt
+++ b/ext/mysqli/tests/mysqli_num_fields.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_num_rows.phpt b/ext/mysqli/tests/mysqli_num_rows.phpt
index f1798cc2c8aa083a5187c5c62c51eadace5ce835..376ddd4e8f4b7a57af0bda8fe11b738f1c65ae10 100644 (file)
--- a/ext/mysqli/tests/mysqli_num_rows.phpt
+++ b/ext/mysqli/tests/mysqli_num_rows.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_options.phpt b/ext/mysqli/tests/mysqli_options.phpt
index 670f9aca750918df5dd9793609889d2a9441edcf..1ca3a34a15e6e59e22d8cb2436fe6d3505f4ce68 100644 (file)
--- a/ext/mysqli/tests/mysqli_options.phpt
+++ b/ext/mysqli/tests/mysqli_options.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
 /*
 TODO: ext/mysqli might lack support for those options which are available

diff --git a/ext/mysqli/tests/mysqli_options_init_command.phpt b/ext/mysqli/tests/mysqli_options_init_command.phpt
index 2ba2ce4616019c0e9795007b15fcce0e2b6510b8..a78dfca20f15a563d6f2593f55a84c3d9d881e40 100644 (file)
--- a/ext/mysqli/tests/mysqli_options_init_command.phpt
+++ b/ext/mysqli/tests/mysqli_options_init_command.phpt
@@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc');
 --FILE--
 <?php
        /* see mysqli.c for details */
-       include "connect.inc";
+       require_once("connect.inc");
 
        if (!($link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)))
                printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",

diff --git a/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt b/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt
index 2c6aae0d3b18ee8affcd4e2c151061c62d7a324d..f40965e59423d7cc16304d36c112984b2f64a160 100644 (file)
--- a/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt
@@ -15,7 +15,7 @@ mysqli.max_persistent=-1
 mysqli.max_links=-1
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $phost = 'p:' . $host;
 

diff --git a/ext/mysqli/tests/mysqli_pconn_disabled.phpt b/ext/mysqli/tests/mysqli_pconn_disabled.phpt
index ee0efc4e53bb2254083b3c09a4727bd6e68ea1fc..1fe6271c7e594df7f83b2fb0f93cb15f198d1a01 100644 (file)
--- a/ext/mysqli/tests/mysqli_pconn_disabled.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_disabled.phpt
@@ -17,7 +17,7 @@ mysqli.max_persistent=2
 mysqli.max_links=2
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $host = 'p:' . $host;
        if (!$link1 = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {

diff --git a/ext/mysqli/tests/mysqli_pconn_max_links.phpt b/ext/mysqli/tests/mysqli_pconn_max_links.phpt
index 3ccb761360f7699a5ab074bb39b65c0d10b759d2..8e755393fe4a009a036c997d5bf5f4d474f7af38 100644 (file)
--- a/ext/mysqli/tests/mysqli_pconn_max_links.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_max_links.phpt
@@ -160,7 +160,7 @@ mysqli.max_persistent=2
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/mysqli_pconn_reuse.phpt b/ext/mysqli/tests/mysqli_pconn_reuse.phpt
index 8a43e7c305bec3d64c4c88ab8aad4460a9e8225b..b42800a77d4b69c17c0041e6192bb8e371806271 100644 (file)
--- a/ext/mysqli/tests/mysqli_pconn_reuse.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_reuse.phpt
@@ -17,7 +17,7 @@ mysqli.max_persistent=2
 mysqli.max_links=2
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $host = 'p:' . $host;
        if (!$link1 = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {

diff --git a/ext/mysqli/tests/mysqli_pconn_twice.phpt b/ext/mysqli/tests/mysqli_pconn_twice.phpt
index ddb95e732d09cba37a2f8e8f967acd5e5b91eb24..12800c2ce44d10ed0fe7a639cdd944a997e40a94 100644 (file)
--- a/ext/mysqli/tests/mysqli_pconn_twice.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_twice.phpt
@@ -15,7 +15,7 @@ mysqli.max_persistent=-1
 mysqli.max_links=-1
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $host = 'p:' . $host;
        if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
@@ -26,7 +26,7 @@ mysqli.max_links=-1
                printf("[003] Expecting boolean/true got %s/%s\n", gettype($tmp), $tmp);
 
        /* it is undefined which pooled connection we get - thread ids may differ */
-       
+
        if (!($res = mysqli_query($link, "SELECT 'ok' AS it_works")) ||
                !($row = mysqli_fetch_assoc($res)))
                printf("[006] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
@@ -40,7 +40,7 @@ mysqli.max_links=-1
                printf("[007] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
                        $host, $user, $db, $port, $socket);
 
-       
+
        if (true !== ($tmp = $link->real_connect($host, $user, $passwd, $db, $port, $socket)))
                printf("[009] Expecting boolean/true got %s/%s\n", gettype($tmp), $tmp);
 

diff --git a/ext/mysqli/tests/mysqli_pconnect.phpt b/ext/mysqli/tests/mysqli_pconnect.phpt
index 57b44ebaf2fff1b98597997947a84ba68089407c..fbb1092e6e62fec6d0c2902d16e9ef32f7e7b04d 100644 (file)
--- a/ext/mysqli/tests/mysqli_pconnect.phpt
+++ b/ext/mysqli/tests/mysqli_pconnect.phpt
@@ -11,7 +11,7 @@ if (!stristr(mysqli_get_client_info(), 'mysqlnd'))
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $host = 'p:' . $host;
        if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))

diff --git a/ext/mysqli/tests/mysqli_ping.phpt b/ext/mysqli/tests/mysqli_ping.phpt
index 80a2a20a2867d8b8d426fa71828c6d23acf8d77c..d9a134c0e9ec2577df951eb10fa61c927cb2e5b6 100644 (file)
--- a/ext/mysqli/tests/mysqli_ping.phpt
+++ b/ext/mysqli/tests/mysqli_ping.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt b/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt
index 56f9182f48a7c8a3c71e8057bfb0450608ae372f..9c02cf9760b27c762bd85717a049f47faaff0d1b 100644 (file)
--- a/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt
+++ b/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt
@@ -155,7 +155,7 @@ if (!$IS_MYSQLND)
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/mysqli_prepare.phpt b/ext/mysqli/tests/mysqli_prepare.phpt
index 0737aba83d29965f31b9ffc393044d8c479ea60f..bba82745e7e9f8f3ffcb677b52ddb12f0a9f02c7 100644 (file)
--- a/ext/mysqli/tests/mysqli_prepare.phpt
+++ b/ext/mysqli/tests/mysqli_prepare.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;
@@ -118,7 +118,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/mysqli_prepare_no_object.phpt b/ext/mysqli/tests/mysqli_prepare_no_object.phpt
index 3d022f440b5fdd2160cf608695edd69c533cb4d9..e45de69edaf4e82ced4ef76d11a9a768b2fa40f7 100644 (file)
--- a/ext/mysqli/tests/mysqli_prepare_no_object.phpt
+++ b/ext/mysqli/tests/mysqli_prepare_no_object.phpt
@@ -8,7 +8,6 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
        require('table.inc');
 
        if (false !== ($tmp = mysqli_prepare($link, false)))

diff --git a/ext/mysqli/tests/mysqli_query.phpt b/ext/mysqli/tests/mysqli_query.phpt
index 0e45f03882e47effde60b1346d037e8978aa3818..73bebe107c1affee31ab426a4c938658344fa9ec 100644 (file)
--- a/ext/mysqli/tests/mysqli_query.phpt
+++ b/ext/mysqli/tests/mysqli_query.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;
@@ -114,7 +114,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/mysqli_query_local_infile_large.phpt b/ext/mysqli/tests/mysqli_query_local_infile_large.phpt
index 306dfceab637771d84f24eaa934e425c66f4955a..8b115a507dc4144523439935bbcde82baea2f437 100644 (file)
--- a/ext/mysqli/tests/mysqli_query_local_infile_large.phpt
+++ b/ext/mysqli/tests/mysqli_query_local_infile_large.phpt
@@ -31,7 +31,7 @@ mysqli.allow_local_infile=1
        fclose($fp);
        printf("Filesize in bytes: %d\nRows: %d\n", $bytes, $rowno);
 
-       include "connect.inc";
+       require_once("connect.inc");
        if (!($link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)))
                printf("[002] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
@@ -72,7 +72,7 @@ $file = tempnam(sys_get_temp_dir(), 'mysqli_test.cvs');
 if (file_exists($file))
        unlink($file);
 
-include "connect.inc";
+require_once("connect.inc");
 if (!($link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)))
        printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/mysqli_query_stored_proc.phpt b/ext/mysqli/tests/mysqli_query_stored_proc.phpt
index 0ca71a40b5d693907d21976d3d3f13fff1ceca92..10bf86bf4829056e097cd2fb81c0664d478461f5 100644 (file)
--- a/ext/mysqli/tests/mysqli_query_stored_proc.phpt
+++ b/ext/mysqli/tests/mysqli_query_stored_proc.phpt
@@ -152,7 +152,7 @@ END;')) {
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/mysqli_real_escape_string.phpt b/ext/mysqli/tests/mysqli_real_escape_string.phpt
index b25c72acd849ba106a1ee97a0c23c13b2dae22ce..6c372581e051aaca9131778ea06b2b45358f4f5d 100644 (file)
--- a/ext/mysqli/tests/mysqli_real_escape_string.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string.phpt
@@ -1,14 +1,14 @@
 --TEST--
 mysqli_real_escape_string()
 --SKIPIF--
-<?php 
+<?php
 require_once('skipif.inc');
-require_once('skipifemb.inc'); 
+require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt b/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt
index 038cca940205e5f484176e6579a5d67b7abe26e0..79309923c4e2058274488bdcb966a56cbe7ac0ff 100644 (file)
--- a/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt
@@ -1,14 +1,14 @@
 --TEST--
 mysqli_real_escape_string()
 --SKIPIF--
-<?php 
+<?php
 require_once('skipif.inc');
-require_once('skipifemb.inc'); 
+require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_real_query.phpt b/ext/mysqli/tests/mysqli_real_query.phpt
index 8e30344159259dd3ac4d638380935e602e3adafd..866ad6a9d4b1238ab6f2648469e021c14709dabc 100644 (file)
--- a/ext/mysqli/tests/mysqli_real_query.phpt
+++ b/ext/mysqli/tests/mysqli_real_query.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;
@@ -91,7 +91,7 @@ ver_param;')) {
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/mysqli_report.phpt b/ext/mysqli/tests/mysqli_report.phpt
index dc927997f388474d32d5bcaf449d492b098d6a89..11ddef88bd209f92ca275b95f89a3e131fce9d0e 100644 (file)
--- a/ext/mysqli/tests/mysqli_report.phpt
+++ b/ext/mysqli/tests/mysqli_report.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_report_wo_ps.phpt b/ext/mysqli/tests/mysqli_report_wo_ps.phpt
index 08909264a7a7d7746c81d0721e8f8903e4246b5b..e7ba6bb7ebadbc93de0a23cf9494d6c4df0676d8 100644 (file)
--- a/ext/mysqli/tests/mysqli_report_wo_ps.phpt
+++ b/ext/mysqli/tests/mysqli_report_wo_ps.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_result_unclonable.phpt b/ext/mysqli/tests/mysqli_result_unclonable.phpt
index dfde9a78c5e83511886c75fcf8c0d56971531d78..0ecc30b62a3e15b79f2553bc821af68490faf382 100644 (file)
--- a/ext/mysqli/tests/mysqli_result_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_result_unclonable.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
                printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",

diff --git a/ext/mysqli/tests/mysqli_rollback.phpt b/ext/mysqli/tests/mysqli_rollback.phpt
index 616f50da84eda7d974663acf2a2dbbcec0542778..1b1fe8b3568081c6a85c093a3124800cc0a76d60 100644 (file)
--- a/ext/mysqli/tests/mysqli_rollback.phpt
+++ b/ext/mysqli/tests/mysqli_rollback.phpt
@@ -29,7 +29,7 @@ mysqli_rollback()
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_select_db.phpt b/ext/mysqli/tests/mysqli_select_db.phpt
index bc774cfec958e0ecf93a2bf4006f0b12ce95d982..d700a2b557bdca81e2e90f223236f0d69d82d11b 100644 (file)
--- a/ext/mysqli/tests/mysqli_select_db.phpt
+++ b/ext/mysqli/tests/mysqli_select_db.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_send_query.phpt b/ext/mysqli/tests/mysqli_send_query.phpt
index 53cf25093ec0e7980f0181496cf5b45dc1a5aa46..7de2bfc21c002ca2436a05649b7b75727091ca66 100755 (executable)
--- a/ext/mysqli/tests/mysqli_send_query.phpt
+++ b/ext/mysqli/tests/mysqli_send_query.phpt
@@ -15,7 +15,7 @@ if (!$TEST_EXPERIMENTAL)
 --FILE--
 <?php
        /* NOTE: tests is a stub, but function is deprecated, as long as it does not crash when invoking it... */
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_set_charset.phpt b/ext/mysqli/tests/mysqli_set_charset.phpt
index baf97bd3d33829dd07fb923de234fc016393d6c8..4f4aaa52a0f0a19398a56bda498f7bf9cf2e1ca4 100644 (file)
--- a/ext/mysqli/tests/mysqli_set_charset.phpt
+++ b/ext/mysqli/tests/mysqli_set_charset.phpt
@@ -50,7 +50,7 @@ if ((($res = mysqli_query($link, 'SHOW CHARACTER SET LIKE "latin1"', MYSQLI_STOR
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

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 cb8162db70c309ac2559c1472e02273e957ef18e..d5fd2360139668b91edf46fe90f5b7f01d52ac25 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
@@ -33,8 +33,7 @@ if ('ON' != $row['Value'])
 mysqli.allow_local_infile=1
 --FILE--
 <?php
-       include "connect.inc";
-       include("table.inc");
+       require("table.inc");
        require_once('local_infile_tools.inc');
 
        function callback_close_link($fp, &$buffer, $buflen, &$error) {

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 7498e64f435f78a80d635dda49f172e37900a0b1..a2e6c57ad7975242d7257b38c097bc9c6049b375 100644 (file)
--- a/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt
+++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt
@@ -33,8 +33,7 @@ if ('ON' != $row['Value'])
 mysqli.allow_local_infile=1
 --FILE--
 <?php
-       include "connect.inc";
-       include("table.inc");
+       require_once("table.inc");
        require_once('local_infile_tools.inc');
 
        function callback_closefile($fp, &$buffer, $buflen, &$error) {

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 3757b61d95541e25f6e4f48c1ca64531fd29dfad..d3b56ebb494787f4764623144f3d0bc02e3582aa 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
@@ -30,8 +30,7 @@ if ('ON' != $row['Value'])
 mysqli.allow_local_infile=1
 --FILE--
 <?php
-       include "connect.inc";
-       include("table.inc");
+       require("table.inc");
        require_once('local_infile_tools.inc');
 
        function callback_kill_link($fp, &$buffer, $buflen, &$error) {

diff --git a/ext/mysqli/tests/mysqli_set_opt.phpt b/ext/mysqli/tests/mysqli_set_opt.phpt
index 21aacd25ff0d1e3ed4babf087b8254ece40b373b..7c96d5980d635df53319115ae6c105b36a53a6ca 100644 (file)
--- a/ext/mysqli/tests/mysqli_set_opt.phpt
+++ b/ext/mysqli/tests/mysqli_set_opt.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

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 77047a19cb7e0cf2d6b2606f3eaae3c82e50429f..7e0593cb50c69cf9954d2eec03fe25f7b7804dfa 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
@@ -14,8 +14,7 @@ if (!stristr(mysqli_get_client_info(), "mysqlnd"))
 ?>
 --FILE--
 <?php
-       include "connect.inc";
-       include "table.inc";
+       require_once("table.inc");
 
        if (true !== ($tmp = mysqli_set_opt($link, MYSQLI_OPT_NUMERIC_AND_DATETIME_AS_UNICODE, 1)))
                printf("[001] Expecting boolean/true, got %s/%s\n", gettype($tmp), $tmp);

diff --git a/ext/mysqli/tests/mysqli_sqlstate.phpt b/ext/mysqli/tests/mysqli_sqlstate.phpt
index 0ed39f4ee5324437715aaaa4014834650593b0ab..56580cda46f8176b110dcee9b418f4466fc10fee 100644 (file)
--- a/ext/mysqli/tests/mysqli_sqlstate.phpt
+++ b/ext/mysqli/tests/mysqli_sqlstate.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_ssl_set.phpt b/ext/mysqli/tests/mysqli_ssl_set.phpt
index e868f34f190d7d2262cd3b6af60afd3f9a473f56..2abae55c1e7d3b818ed2548ac0033add20774a74 100644 (file)
--- a/ext/mysqli/tests/mysqli_ssl_set.phpt
+++ b/ext/mysqli/tests/mysqli_ssl_set.phpt
@@ -10,7 +10,7 @@ if (!function_exists('mysqli_ssl_set'))
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_stat.phpt b/ext/mysqli/tests/mysqli_stat.phpt
index 7d7d4e70ce26b39f2edf57f9b4184bf8bd6f22fb..f1cd56ccd11f436229cd0402c8c634f9d4fccf98 100644 (file)
--- a/ext/mysqli/tests/mysqli_stat.phpt
+++ b/ext/mysqli/tests/mysqli_stat.phpt
@@ -1,14 +1,14 @@
 --TEST--
 mysqli_stat()
 --SKIPIF--
-<?php 
+<?php
 require_once('skipif.inc');
-require_once('skipifemb.inc'); 
+require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt b/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt
index d4761dd6b83d551a7042c8e99fa82ed3b97a2ef3..4765d648728f2f7eaa755943d7521a24e593e841 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_stmt_attr_get.phpt b/ext/mysqli/tests/mysqli_stmt_attr_get.phpt
index abedf56b21d502e43dc812f9331ecee3c4bcd0c3..a4eb4d0f353bc1da485433bbe079c46af0809db8 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_attr_get.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_attr_get.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt b/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt
index 26bbf9649c2b3c84850b36ef086d72fcff322a73..0d5e8f9bec353defeb023f1dcf43072295f4e478 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt
@@ -9,7 +9,6 @@ die("SKIP: prefetch isn't supported at the moment");
 ?>
 --FILE--
 <?php
-       include "connect.inc";
        require('table.inc');
 
        $stmt = mysqli_stmt_init($link);

diff --git a/ext/mysqli/tests/mysqli_stmt_attr_set.phpt b/ext/mysqli/tests/mysqli_stmt_attr_set.phpt
index 7bc9882f8a412c87601fe2d8b5a1e1067d8c0688..db92d4bff2fec04787c00c7d84923a5db60d33f2 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_attr_set.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_attr_set.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param.phpt
index 9aaac980400bf21efa72b6171b879faf3ce96d27..33ef3175ac88578391bf49121a2ff2125dd0147a 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_bind_param.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_param.phpt
@@ -17,7 +17,7 @@ require_once('skipifconnectfailure.inc');
        in this file and we test mysqli_stmt_bind_result() in the other
        test -- therefore the "duplicate" makes some sense to me.
        */
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

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 a7d36743c050aae6c56273d001f955b2b4ee6f3f..e1e3a92e56a107a92f2cb1624d0ab2fefa7d0e38 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
@@ -8,7 +8,6 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
        require('table.inc');
 
        class foo {

diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt
index 24d4314f1f8320e8590572e74332063ab0fe8023..91cb9d022b4936a6ee42aaef2e64ad1507f71577 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt
@@ -8,7 +8,6 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
        require('table.inc');
 
        function findRow($offset, $link, $id, $label) {

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 ab871ce95a2154b5118dfcd5878d6d534d331f1e..daab40c50682ea74f875852b5a2358e2b0da67df 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt
@@ -8,7 +8,6 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
        require('table.inc');
 
        function bind_twice($link, $engine, $sql_type1, $sql_type2, $bind_type1, $bind_type2, $bind_value1, $bind_value2, $offset) {

diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result.phpt
index f5756740e03b12a879edce1ea38b61625cf34544..5b7da34d8df67d5f953421bbe358fc755a56814e 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_bind_result.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_result.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $hint_str_or_unicode = (version_compare(PHP_VERSION, '5.9.9', '>') == 1) ? "unicode":"string";
 

diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt
index 1eef7674781cc803619628f2209d003e50686b2d..acf0d0be2d2e3642f68a4677acbf9c9a8740e3e0 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        function dec32bin($dec, $bits) {
 

diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt
index 511f7e3e19027942ff8dc62a01c962a75a74fd41..ee659d4b4ab066d006809c9ef46351de7b531970 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt
@@ -8,7 +8,6 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
        require('table.inc');
 
        $stmt = mysqli_stmt_init($link);

diff --git a/ext/mysqli/tests/mysqli_stmt_close.phpt b/ext/mysqli/tests/mysqli_stmt_close.phpt
index b38f0cd684b348f055e1591c1e9b5bd7ee37639c..64e76e54ced76d98d0199c0444c59f53fe729ef5 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_close.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_close.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_stmt_data_seek.phpt b/ext/mysqli/tests/mysqli_stmt_data_seek.phpt
index 246158e4cb6cef73adfd06eee35fc8c2b9157ed2..a1cebeae80d1bda9f29a599fcc7d9f329ef468fb 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_data_seek.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_data_seek.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt
index 25c183a2a1da1c14e64218e0e766fe78b50ed7c0..b23f94d81ebf51d6f36257b17c702eb33a2d90a2 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
        if (!$c1 = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
                printf("Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
                        $host, $user, $db, $port, $socket);
@@ -56,7 +56,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/mysqli_stmt_errno.phpt b/ext/mysqli/tests/mysqli_stmt_errno.phpt
index 59fde718da23264d7954721f54cd825863f259b6..070f2514a201a08aaec4317863454293f669ae23 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_errno.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_errno.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_stmt_error.phpt b/ext/mysqli/tests/mysqli_stmt_error.phpt
index ffb77fe0a5a8ba6139a3963e74446f82681e38e3..e18aa07f321d49c481598b52684601731a8953b7 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_error.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_error.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_stmt_execute.phpt b/ext/mysqli/tests/mysqli_stmt_execute.phpt
index d1d62c206fda3dee0873e919ffb2a8b55eb6aceb..61763864e554814ab20970c59f6349d0670f70e0 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_execute.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_execute.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt
index afedea42df0479a599af9c8ca453ca016b6edfda..29e3947a784e70741cc062361dd16271941a6054 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt
@@ -183,7 +183,7 @@ if (mysqli_get_server_version($link) <= 50000) {
 ?>
 --CLEAN--
 <?php
-include "connect.inc";
+require_once("connect.inc");
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 

diff --git a/ext/mysqli/tests/mysqli_stmt_fetch.phpt b/ext/mysqli/tests/mysqli_stmt_fetch.phpt
index 6f7014831fd2c1bc347be92d9b7d9c1fc35f3b10..fca510003e9ea15d138bdb4f8746f340e73fbaa9 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_fetch.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_fetch.phpt
@@ -13,7 +13,7 @@ require_once('skipifconnectfailure.inc');
        mysqli_stmt_bind_result.phpt already. Restrict
        this test case to the basics.
        */
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

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 e63591a10867ca920b2d9f66e70a8b8c93e8f5fb..0cbc05f6c722b9e03c71926018099d9660ac5d09 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt
@@ -8,8 +8,8 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
-       require('table.inc');
+       require_once("connect.inc");
+       require_once('table.inc');
 
        $bind_res = $id = null;
        if (!($stmt = mysqli_stmt_init($link)) ||

diff --git a/ext/mysqli/tests/mysqli_stmt_field_count.phpt b/ext/mysqli/tests/mysqli_stmt_field_count.phpt
index 2dbf487ac3d4ca9f48762e37d451a3a4041498a7..7dfd3a400cbece238291acf420b08e1cce0cedf9 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_field_count.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_field_count.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_stmt_free_result.phpt b/ext/mysqli/tests/mysqli_stmt_free_result.phpt
index 12c1a34bcbaabe766470b0d5bacd0cbb7f2228a9..08b33b795954485215a17ffb417a844b3ca10bac 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_free_result.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_free_result.phpt
@@ -13,7 +13,7 @@ require_once('skipifconnectfailure.inc');
        mysqli_stmt_bind_result.phpt already. Restrict
        this test case to the basics.
        */
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_stmt_get_result.phpt b/ext/mysqli/tests/mysqli_stmt_get_result.phpt
index 58a7f0cde071f9efdc2fcb3633805a34d5022e44..fe18be40c3176acf75bfd65c65e4058a1fa7ab97 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_get_result.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result.phpt
@@ -16,7 +16,7 @@ if (!function_exists('mysqli_stmt_get_result'))
        mysqli_stmt_bind_result.phpt already. Restrict
        this test case to the basics.
        */
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_stmt_get_result2.phpt b/ext/mysqli/tests/mysqli_stmt_get_result2.phpt
index 1f493d2f1102273e41d2ff95da676780f2029b00..8c2aad1f12a51ef0636874b2f13dcbd91e403cb8 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_get_result2.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result2.phpt
@@ -15,7 +15,7 @@ if (!function_exists('mysqli_stmt_get_result'))
        mysqli_stmt_bind_result.phpt already. Restrict
        this test case to the basics.
        */
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

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 dab805c1b57749a964ccb4fca7966ebbd0724264..046f90438e4c4c126987f8252666128362bf81cb 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt
@@ -11,7 +11,6 @@ mysqli_stmt_get_result() - meta data, field_count()
 ?>
 --FILE--
 <?php
-       include "connect.inc";
        require('table.inc');
 
        if (!$stmt = mysqli_stmt_init($link))

diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt
index 7fdabc001c6a8a567a32c30d284086d2930d1cde..86898807adb444712a9fd7ad9378693efb945b81 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt
@@ -11,7 +11,6 @@ if (!function_exists('mysqli_stmt_get_result'))
 ?>
 --FILE--
 <?php
-       include "connect.inc";
        require('table.inc');
 
        if (!$stmt = mysqli_stmt_init($link))

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 43ec10c4f8dba1a3505997ed8b4ba31e7ab01ac4..1a2dba413330ac0df61e0b67b9d1f110ddc1f250 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
@@ -11,7 +11,6 @@ if (!function_exists('mysqli_stmt_get_result'))
 ?>
 --FILE--
 <?php
-       include "connect.inc";
        require('table.inc');
 
        if (!($stmt = mysqli_stmt_init($link)) ||

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 717b39bd5b9ade9bdafa25b13cbd754e103d0577..c057f7d9fb15aa7b6d1353c862e61f49accbce2a 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt
@@ -16,7 +16,6 @@ if (!function_exists('mysqli_stmt_get_result'))
        mysqli_stmt_bind_result.phpt already. Restrict
        this test case to the basics.
        */
-       include "connect.inc";
        require('table.inc');
 
        if (!$stmt = mysqli_stmt_init($link))

diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt
index c4312c603d49048a7971e1916735cfa821b01482..ffb655d5faeffccd4dbcdcf47be02a4378cfe5ad 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt
@@ -11,7 +11,6 @@ if (!function_exists('mysqli_stmt_get_result'))
 ?>
 --FILE--
 <?php
-       include "connect.inc";
        require('table.inc');
 
        if (!$stmt = mysqli_stmt_init($link))

diff --git a/ext/mysqli/tests/mysqli_stmt_init.phpt b/ext/mysqli/tests/mysqli_stmt_init.phpt
index 7d0154d24cbef131a800e4bfa22e94959434412d..4f09719c87f6a0a115ac0627505864a2f959dd87 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_init.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_init.phpt
@@ -13,7 +13,7 @@ require_once('skipifconnectfailure.inc');
        mysqli_stmt_bind_result.phpt already. Restrict
        this test case to the basics.
        */
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_stmt_insert_id.phpt b/ext/mysqli/tests/mysqli_stmt_insert_id.phpt
index 0347e66bd51bf604dbbeb4e4d5d022f2328d33c9..c7a5affd9dd200a44eeb24c34809b32d777710c4 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_insert_id.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_insert_id.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_stmt_num_rows.phpt b/ext/mysqli/tests/mysqli_stmt_num_rows.phpt
index 4f3bc6142882323d0b5c1efa9f0c0536a0487ac7..28ee64fd51e309077d43ad8b5d370e02103762b2 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_num_rows.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_num_rows.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_stmt_param_count.phpt b/ext/mysqli/tests/mysqli_stmt_param_count.phpt
index f55acfbbdb248de32dbbafdb7e99293a6ca38e78..84bcfd9e8be840fd14a7ca12292d9548792439f1 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_param_count.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_param_count.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_stmt_prepare.phpt b/ext/mysqli/tests/mysqli_stmt_prepare.phpt
index 115e1a52e6d666a8862c25e1b7e17e884795cead..3eb576aec3f22f34322469e12feea21fcd07ecc5 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_prepare.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_prepare.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        // Note: No SQL tests here! We can expand one of the *fetch()
        // tests to a generic SQL test, if we ever need that.

diff --git a/ext/mysqli/tests/mysqli_stmt_reset.phpt b/ext/mysqli/tests/mysqli_stmt_reset.phpt
index 9f8864d2865dc014128e07371535373bc87b8896..d731da2f5e64357532bc8883f5b4c77d1864af7f 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_reset.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_reset.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        // Note: No SQL tests here! We can expand one of the *fetch()
        // tests to a generic SQL test, if we ever need that.

diff --git a/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt b/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt
index 34d3bb20159b7d2d4d9a633db75e0b437a437280..faccdf9e89532c91a4685efe968b9374b1dc6904 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt
index f0b77576497b8c7987498ea6d6f8d20f214d094a..a7dad1b47c2729144f0fff782b51e5e0dbca0512 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt
@@ -10,7 +10,6 @@ die("skip Check again when the Klingons visit earth - http://bugs.mysql.com/bug.
 ?>
 --FILE--
 <?php
-       include "connect.inc";
        require('table.inc');
 
        function testStatement($offset, $link, $sql, $expected_lib, $expected_mysqlnd, $check_mysqlnd, $compare) {

diff --git a/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt b/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt
index 4f173eff681db92549ddf8d28714c833fe94176c..1a6a3d7dbf3ea502f1f368057d15b5befb2c21e3 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

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 5bd40d84f467bb9c06086b76389fc5985d9cda67..a1fc2007fe0f6acd7b2613bd7befe5e318a8ea36 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
@@ -11,7 +11,6 @@ if (stristr(mysqli_get_client_info(), 'mysqlnd'))
 ?>
 --FILE--
 <?php
-       include "connect.inc";
        require('table.inc');
 
        if (!$stmt = mysqli_stmt_init($link))

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 be8e59544b566b55eb08dc668beda92921641664..95d2302f4c494b09ed63c14c67ed38e8809f8a54 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
@@ -11,7 +11,6 @@ if (!stristr(mysqli_get_client_info(), 'mysqlnd'))
 ?>
 --FILE--
 <?php
-       include "connect.inc";
        require('table.inc');
 
        if (!$stmt = mysqli_stmt_init($link))

diff --git a/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt b/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt
index b8a97cdef8236281c51fc137ab6583ee255324d6..5ea35df240d527ed65174065337af73ac7105098 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_stmt_store_result.phpt b/ext/mysqli/tests/mysqli_stmt_store_result.phpt
index ee0bf83a8429040455f8b31b10b9a70dd0cdc537..a6411ca93706e7e4fe1b5b87527dec6bd92a26fe 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_store_result.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_store_result.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_stmt_unclonable.phpt b/ext/mysqli/tests/mysqli_stmt_unclonable.phpt
index edddbea9489951b3938d064dd82ac309e67db669..57d8d6d6a6c4e3f74f9d4cb15e2a80aa815003b4 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_unclonable.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
                printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",

diff --git a/ext/mysqli/tests/mysqli_store_result.phpt b/ext/mysqli/tests/mysqli_store_result.phpt
index 206cae30957eb8664868c3fe825389fe47bf0abb..c61c124daf3eb02141450be2168611b6fa1e1c35 100644 (file)
--- a/ext/mysqli/tests/mysqli_store_result.phpt
+++ b/ext/mysqli/tests/mysqli_store_result.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_thread_id.phpt b/ext/mysqli/tests/mysqli_thread_id.phpt
index a67060a1c4a398d5bebdadf97f8179e33a8a8d12..3a7e1ae5da8cb121f5686c12171c45a2e438abbb 100644 (file)
--- a/ext/mysqli/tests/mysqli_thread_id.phpt
+++ b/ext/mysqli/tests/mysqli_thread_id.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_unclonable.phpt b/ext/mysqli/tests/mysqli_unclonable.phpt
index d21eafa797ec6e9be0791428e4d8c4c3730f80f3..e332b9f24fef0d150794fbaff5dd56bb272fbf1c 100644 (file)
--- a/ext/mysqli/tests/mysqli_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_unclonable.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
                printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",

diff --git a/ext/mysqli/tests/mysqli_use_result.phpt b/ext/mysqli/tests/mysqli_use_result.phpt
index d1b09f10437d64049982ce2a78fcf5ac44004375..25d16926a84f017bffd6997e3a376e88081acf4e 100644 (file)
--- a/ext/mysqli/tests/mysqli_use_result.phpt
+++ b/ext/mysqli/tests/mysqli_use_result.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_warning_count.phpt b/ext/mysqli/tests/mysqli_warning_count.phpt
index 0293fe86967778ba714855b123b4d0e180f84917..cff9c02b1f7ef51dee581060fca477f10a3a8d01 100644 (file)
--- a/ext/mysqli/tests/mysqli_warning_count.phpt
+++ b/ext/mysqli/tests/mysqli_warning_count.phpt
@@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        $tmp    = NULL;
        $link   = NULL;

diff --git a/ext/mysqli/tests/mysqli_warning_unclonable.phpt b/ext/mysqli/tests/mysqli_warning_unclonable.phpt
index 57d5de764c5e6ab0b7334fee1032b999882c4929..d3ae47d0b4dadc09a8eeb95e412eb3c763e8a419 100644 (file)
--- a/ext/mysqli/tests/mysqli_warning_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_warning_unclonable.phpt
@@ -11,7 +11,7 @@ if (!$TEST_EXPERIMENTAL)
 ?>
 --FILE--
 <?php
-       include "connect.inc";
+       require_once("connect.inc");
 
        if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
                printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",