Merge from HEAD: looks more than it is. Whitespace, some SQL formatting changes etc.

No "real" changes.

diff --git a/ext/mysqli/tests/002.phpt b/ext/mysqli/tests/002.phpt
index a0d4b878f0ae04e63dbd8eb9b7b9e4f2e5a2148b..ac3e611406df805b0eb53ff2d525beb6651fa7bf 100644 (file)
--- a/ext/mysqli/tests/002.phpt
+++ b/ext/mysqli/tests/002.phpt
@@ -1,8 +1,8 @@
 --TEST--
 mysqli bind_result 1
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -42,6 +42,7 @@ require_once('skipifconnectfailure.inc');
        var_dump($test);
 
        mysqli_stmt_close($stmt);
+       @mysqli_query($link, "DROP TABLE IF EXISTS test_fetch_null");
        mysqli_close($link);
        print "done!";
 ?>

diff --git a/ext/mysqli/tests/003.phpt b/ext/mysqli/tests/003.phpt
index be8444da8aaf815d7891f033e91301990b2f1ced..89dbf11605a4d116198ea05cdba820e6dcc64eb6 100644 (file)
--- a/ext/mysqli/tests/003.phpt
+++ b/ext/mysqli/tests/003.phpt
@@ -68,6 +68,7 @@ require_once('skipifconnectfailure.inc');
        var_dump($test);
 
        mysqli_stmt_close($stmt);
+       mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result");
        mysqli_close($link);
        print "done!";
 ?>

diff --git a/ext/mysqli/tests/004.phpt b/ext/mysqli/tests/004.phpt
index 1080d0ea9e47cee4d43f7c3c87930a37e3c5e9a4..4aab97dacf0af3d49f7758e5b14986aebd70729f 100644 (file)
--- a/ext/mysqli/tests/004.phpt
+++ b/ext/mysqli/tests/004.phpt
@@ -1,8 +1,8 @@
 --TEST--
-mysqli fetch char/text 
+mysqli fetch char/text
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -16,7 +16,7 @@ require_once('skipifconnectfailure.inc');
 
        if (!mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch"))
                printf("[001] [%d] string\n", mysqli_errno($link), mysqli_error($link));
-               
+
        if (!mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 char(10), c2 text) ENGINE=" . $engine))
                printf("[002] [%d] string\n", mysqli_errno($link), mysqli_error($link));
 
@@ -43,6 +43,7 @@ require_once('skipifconnectfailure.inc');
        }
 
        mysqli_stmt_close($stmt);
+       mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");
        mysqli_close($link);
        print "done!";
 ?>

diff --git a/ext/mysqli/tests/005.phpt b/ext/mysqli/tests/005.phpt
index ce53929e0d0c9dfd29ccc80ecdbd401d22bf584c..a05dc501b0604d4edf21c877ee9b1490113fa895 100644 (file)
--- a/ext/mysqli/tests/005.phpt
+++ b/ext/mysqli/tests/005.phpt
@@ -1,20 +1,20 @@
 --TEST--
-mysqli fetch char/text long 
+mysqli fetch char/text long
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
        include "connect.inc";
-       
+
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
        if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))
                printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-               
+
        if (!mysqli_query($link, "CREATE TABLE test_bind_fetch(c1 char(10), c2 text) ENGINE=" . $engine))
                printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
@@ -33,6 +33,7 @@ require_once('skipifconnectfailure.inc');
        var_dump($test);
 
        mysqli_stmt_close($stmt);
+       mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");
        mysqli_close($link);
        print "done!";
 ?>

diff --git a/ext/mysqli/tests/006.phpt b/ext/mysqli/tests/006.phpt
index 43853ecebc06dad1da48ce6d97257412e33b218d..b11760c6dffcede2d289b15b76bed8594e94ffc5 100644 (file)
--- a/ext/mysqli/tests/006.phpt
+++ b/ext/mysqli/tests/006.phpt
@@ -1,8 +1,8 @@
 --TEST--
 mysqli fetch long values
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -41,6 +41,7 @@ require_once('skipifconnectfailure.inc');
        var_dump($test);
 
        mysqli_stmt_close($stmt);
+       mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");
        mysqli_close($link);
        print "done!";
 ?>

diff --git a/ext/mysqli/tests/007.phpt b/ext/mysqli/tests/007.phpt
index db8070a5bb315f55446c605ef43a764e8019f02d..f0a144686e7be636a7a640e3b90d3355bfc33ece 100644 (file)
--- a/ext/mysqli/tests/007.phpt
+++ b/ext/mysqli/tests/007.phpt
@@ -1,8 +1,8 @@
 --TEST--
 mysqli fetch short values
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -41,6 +41,7 @@ require_once('skipifconnectfailure.inc');
        var_dump($test);
 
        mysqli_stmt_close($stmt);
+       mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");
        mysqli_close($link);
        print "done!";
 ?>

diff --git a/ext/mysqli/tests/008.phpt b/ext/mysqli/tests/008.phpt
index da4ae7dd8d435f57ff84b373cf496ebc8da918d1..00ac730bad0cd5dd96bc95514e0a46dc7acae5d3 100644 (file)
--- a/ext/mysqli/tests/008.phpt
+++ b/ext/mysqli/tests/008.phpt
@@ -1,8 +1,8 @@
 --TEST--
 mysqli fetch tinyint values
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -41,6 +41,7 @@ require_once('skipifconnectfailure.inc');
        var_dump($test);
 
        mysqli_stmt_close($stmt);
+       mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");
        mysqli_close($link);
        print "done!";
 ?>

diff --git a/ext/mysqli/tests/009.phpt b/ext/mysqli/tests/009.phpt
index e018d9302b1cd5973eedc4812f0e9257fc76a350..5a498953be99b84eb9f97bf319e91f91fa7b845d 100644 (file)
--- a/ext/mysqli/tests/009.phpt
+++ b/ext/mysqli/tests/009.phpt
@@ -73,6 +73,8 @@ mysqli fetch bigint values (ok to fail with 4.1.x)
        echo $c1, "\n", $c2, "\n";
 
        mysqli_stmt_close($stmt);
+       mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");
+       mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch_uint");
        mysqli_close($link);
        print "done!";
 ?>

diff --git a/ext/mysqli/tests/010.phpt b/ext/mysqli/tests/010.phpt
index ea9bb2882f40040ff3a05cddf10e38734c7f5c86..10f8824307775f2931933ecbea21a523c0e2b9ba 100644 (file)
--- a/ext/mysqli/tests/010.phpt
+++ b/ext/mysqli/tests/010.phpt
@@ -3,14 +3,14 @@ mysqli fetch float values
 --INI--
 precision=12
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
        include "connect.inc";
-       
+
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
@@ -19,13 +19,13 @@ require_once('skipifconnectfailure.inc');
 
        if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))
                printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-               
+
        $rc = mysqli_query($link, "CREATE TABLE test_bind_fetch(c1 float(3),
                                                                                                         c2 float,
                                                                                                         c3 float unsigned,
                                                                                                         c4 float,
                                                                                                         c5 float,
-                                                                                                        c6 float,      
+                                                                                                        c6 float,
                                                                                                         c7 float(10) unsigned) ENGINE=" . $engine);
        if (!$rc)
                printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
@@ -44,6 +44,7 @@ require_once('skipifconnectfailure.inc');
        var_dump($test);
 
        mysqli_stmt_close($stmt);
+       mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");
        mysqli_close($link);
        print "done!";
 ?>

diff --git a/ext/mysqli/tests/011.phpt b/ext/mysqli/tests/011.phpt
index 16de67736e859f85fbdc855da49b940bebc688d5..e3b5922eaa8427d5e967dac85f14d4535aaf6bd1 100644 (file)
--- a/ext/mysqli/tests/011.phpt
+++ b/ext/mysqli/tests/011.phpt
@@ -3,24 +3,24 @@ mysqli fetch mixed values
 --INI--
 precision=12
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
        include "connect.inc";
-       
+
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
        if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result"))
                printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
-       $rc = mysqli_query($link, "CREATE TABLE test_bind_result(c1 tinyint, c2 smallint, 
-                                                                                                               c3 int, c4 bigint, 
+       $rc = mysqli_query($link, "CREATE TABLE test_bind_result(c1 tinyint, c2 smallint,
+                                                                                                               c3 int, c4 bigint,
                                                                                                                c5 float, c6 double,
-                                                                                                               c7 varbinary(10), 
+                                                                                                               c7 varbinary(10),
                                                                                                                c8 varchar(50)) ENGINE=" . $engine);
        if (!$rc)
                printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
@@ -30,7 +30,7 @@ require_once('skipifconnectfailure.inc');
                                                                                                                          'foobar','mysql rulez')");
        if (!$rc)
                printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-               
+
        $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_result");
        mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7, $c8);
        mysqli_execute($stmt);
@@ -41,6 +41,7 @@ require_once('skipifconnectfailure.inc');
        var_dump($test);
 
        mysqli_stmt_close($stmt);
+       mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result");
        mysqli_close($link);
        print "done!";
 ?>

diff --git a/ext/mysqli/tests/012.phpt b/ext/mysqli/tests/012.phpt
index d0c92f67ceaf7b236d3ae921bdef47a2571c164a..eb2f6410cebc3d6226923947ba2f5c9f62d09f0c 100644 (file)
--- a/ext/mysqli/tests/012.phpt
+++ b/ext/mysqli/tests/012.phpt
@@ -3,8 +3,8 @@ mysqli fetch mixed values 2
 --INI--
 precision=12
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -40,6 +40,7 @@ require_once('skipifconnectfailure.inc');
        var_dump($test);
 
        mysqli_stmt_close($stmt);
+       mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result");
        mysqli_close($link);
        print "done!";
 ?>

diff --git a/ext/mysqli/tests/013.phpt b/ext/mysqli/tests/013.phpt
index 88c8e0d58842495c3235e7973b5c33c4588e8f5d..fc8211b2b6ca9c72d1aeba8a1807f6710f1fdaea 100644 (file)
--- a/ext/mysqli/tests/013.phpt
+++ b/ext/mysqli/tests/013.phpt
@@ -1,8 +1,8 @@
 --TEST--
 mysqli fetch mixed / mysql_query (may fail when using 4.1 library with 5.x server)
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -52,6 +52,7 @@ require_once('skipifconnectfailure.inc');
        else
                echo "error";
 
+       mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result");
        mysqli_close($link);
        print "done!";
 ?>

diff --git a/ext/mysqli/tests/014.phpt b/ext/mysqli/tests/014.phpt
index 93c2adca180f5a18a3a942c6bfa7d9565bba434d..1f845f8e6f07350557222ef3b56b37de582dd654 100644 (file)
--- a/ext/mysqli/tests/014.phpt
+++ b/ext/mysqli/tests/014.phpt
@@ -27,28 +27,28 @@ mysqli autocommit/commit/rollback
        if (!mysqli_autocommit($link, TRUE))
                printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
-       if (!mysqli_query($link, "DROP TABLE IF EXISTS ac_01"))
+       if (!mysqli_query($link, "DROP TABLE IF EXISTS test"))
                printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
-       if (!mysqli_query($link, "CREATE TABLE ac_01(a int, b varchar(10)) type=InnoDB"))
+       if (!mysqli_query($link, "CREATE TABLE test(a int, b varchar(10)) engine=InnoDB"))
                printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
-       if (!mysqli_query($link, "INSERT INTO ac_01 VALUES (1, 'foobar')"))
+       if (!mysqli_query($link, "INSERT INTO test VALUES (1, 'foobar')"))
                printf("[004] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
        if (!mysqli_autocommit($link, FALSE))
                printf("[005] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
-       if (!mysqli_query($link, "DELETE FROM ac_01"))
+       if (!mysqli_query($link, "DELETE FROM test"))
                printf("[006] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
-       if (!mysqli_query($link, "INSERT INTO ac_01 VALUES (2, 'egon')"))
+       if (!mysqli_query($link, "INSERT INTO test VALUES (2, 'egon')"))
                printf("[007] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
        if (!mysqli_rollback($link))
                printf("[008] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
-       if (!$result = mysqli_query($link, "SELECT * FROM ac_01"))
+       if (!$result = mysqli_query($link, "SELECT * FROM test"))
                printf("[009] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
        printf("Num_of_rows=%d\n", mysqli_num_rows($result));
@@ -59,16 +59,16 @@ mysqli autocommit/commit/rollback
 
        var_dump($row);
 
-       if (!mysqli_query($link, "DELETE FROM ac_01"))
+       if (!mysqli_query($link, "DELETE FROM test"))
                printf("[011] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
-       if (!mysqli_query($link, "INSERT INTO ac_01 VALUES (2, 'egon')"))
+       if (!mysqli_query($link, "INSERT INTO test VALUES (2, 'egon')"))
                printf("[012] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
        if (!mysqli_commit($link))
                printf("[012] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
-       if (!$result = mysqli_query($link, "SELECT * FROM ac_01"))
+       if (!$result = mysqli_query($link, "SELECT * FROM test"))
                printf("[013] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
        if (!$row = mysqli_fetch_row($result))
@@ -78,6 +78,7 @@ mysqli autocommit/commit/rollback
 
        var_dump($row);
 
+       mysqli_query($link, "DROP TABLE IF EXISTS test");
        mysqli_close($link);
        print "done!";
 ?>

diff --git a/ext/mysqli/tests/015.phpt b/ext/mysqli/tests/015.phpt
index f68e9aa72a45e6680df64418b7e6f1918aabd1b1..ac50fc8c6d5259fb6b761796f26cdbf74e57aadc 100644 (file)
--- a/ext/mysqli/tests/015.phpt
+++ b/ext/mysqli/tests/015.phpt
@@ -20,39 +20,60 @@ mysqli autocommit/commit/rollback with innodb
        include "connect.inc";
 
        $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+       if (!$link)
+               printf("[001] Cannot connect, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
-       mysqli_select_db($link, $db);
+       if (!mysqli_select_db($link, $db))
+               printf("[002] Cannot select DB '%s', [%d] %s\n", $db,
+                       mysqli_errno($link), mysqli_error($link));
 
-       mysqli_autocommit($link, TRUE);
+       if (!mysqli_autocommit($link, TRUE))
+               printf("[003] Cannot turn on autocommit mode, [%d] %s\n",
+                       mysqli_errno($link), mysqli_error($link));
 
-       mysqli_query($link,"DROP TABLE IF EXISTS ac_01");
+       if (!mysqli_query($link,"DROP TABLE IF EXISTS test") ||
+               !mysqli_query($link,"CREATE TABLE test(a int, b varchar(10)) Engine=InnoDB") ||
+               !mysqli_query($link, "INSERT INTO test VALUES (1, 'foobar')"))
+               printf("[004] Cannot create test data, [%d] %s\n",
+                       mysqli_errno($link), mysqli_error($link));
 
-       mysqli_query($link,"CREATE TABLE ac_01(a int, b varchar(10)) Engine=InnoDB");
+       if (!mysqli_autocommit($link, FALSE))
+               printf("[005] Cannot turn off autocommit mode, [%d] %s\n",
+                       mysqli_errno($link), mysqli_error($link));
 
-       mysqli_query($link, "INSERT INTO ac_01 VALUES (1, 'foobar')");
-       mysqli_autocommit($link, FALSE);
+       if (!mysqli_query($link, "DELETE FROM test") ||
+                       !mysqli_query($link, "INSERT INTO test VALUES (2, 'egon')"))
+               printf("[006] Cannot modify test data, [%d] %s\n",
+                       mysqli_errno($link), mysqli_error($link));
 
-       mysqli_query($link, "DELETE FROM ac_01");
-       mysqli_query($link, "INSERT INTO ac_01 VALUES (2, 'egon')");
+       if (!mysqli_rollback($link))
+               printf("[007] Cannot call rollback, [%d] %s\n",
+                       mysqli_errno($link), mysqli_error($link));
 
-       mysqli_rollback($link);
-
-       $result = mysqli_query($link, "SELECT SQL_NO_CACHE * FROM ac_01");
+       $result = mysqli_query($link, "SELECT SQL_NO_CACHE * FROM test");
+       if (!$result)
+               printf("[008] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
        $row = mysqli_fetch_row($result);
        mysqli_free_result($result);
 
        var_dump($row);
 
-       mysqli_query($link, "DELETE FROM ac_01");
-       mysqli_query($link, "INSERT INTO ac_01 VALUES (2, 'egon')");
+       if (!mysqli_query($link, "DELETE FROM test") ||
+                       !mysqli_query($link, "INSERT INTO test VALUES (2, 'egon')"))
+               printf("[009] Cannot modify test data, [%d] %s\n",
+                       mysqli_errno($link), mysqli_error($link));
+
        mysqli_commit($link);
 
-       $result = mysqli_query($link, "SELECT * FROM ac_01");
+       $result = mysqli_query($link, "SELECT * FROM test");
+       if (!$result)
+               printf("[010] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
        $row = mysqli_fetch_row($result);
        mysqli_free_result($result);
 
        var_dump($row);
 
+       mysqli_query($link, "DROP TABLE IF EXISTS test");
        mysqli_close($link);
        print "done!";
 ?>

diff --git a/ext/mysqli/tests/017.phpt b/ext/mysqli/tests/017.phpt
index 1fe24aa3bebc82dc9dcc25b5826f5d72b683857b..8acac0e5bcb3d390c6ed51585d6ae02e2f3928af 100644 (file)
--- a/ext/mysqli/tests/017.phpt
+++ b/ext/mysqli/tests/017.phpt
@@ -1,7 +1,7 @@
 --TEST--
-mysqli fetch functions 
+mysqli fetch functions
 --SKIPIF--
-<?php 
+<?php
 require_once('skipif.inc');
 require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
@@ -9,14 +9,14 @@ require_once('skipifconnectfailure.inc');
 --FILE--
 <?php
        include "connect.inc";
-       
+
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
        if (!$stmt = mysqli_prepare($link, "SELECT md5('bar'), database(), 'foo'"))
                printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
-       mysqli_bind_result($stmt, $c0, $c1, $c2); 
+       mysqli_bind_result($stmt, $c0, $c1, $c2);
        mysqli_execute($stmt);
 
        mysqli_fetch($stmt);

diff --git a/ext/mysqli/tests/019.phpt b/ext/mysqli/tests/019.phpt
index 5db5eb0e781fb64d9f1fa3c68a67524b200f581e..964ed8fa47aa4df907973fc16bab8805917610ac 100644 (file)
--- a/ext/mysqli/tests/019.phpt
+++ b/ext/mysqli/tests/019.phpt
@@ -1,14 +1,14 @@
 --TEST--
-mysqli fetch (bind_param + bind_result) 
+mysqli fetch (bind_param + bind_result)
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
        include "connect.inc";
-       
+
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
@@ -16,18 +16,18 @@ require_once('skipifconnectfailure.inc');
                printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
        $rc = mysqli_query($link,"CREATE TABLE insert_read(col1 tinyint, col2 smallint,
-                                                                                                       col3 int, col4 bigint, 
+                                                                                                       col3 int, col4 bigint,
                                                                                                        col5 float, col6 double,
-                                                                                                       col7 date, col8 time, 
-                                                                                                       col9 varbinary(10), 
+                                                                                                       col7 date, col8 time,
+                                                                                                       col9 varbinary(10),
                                                                                                        col10 varchar(50),
                                                                                                        col11 char(20)) ENGINE=" . $engine);
        if (!$rc)
                printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-  
-       if (!$stmt = mysqli_prepare($link, "INSERT INTO insert_read(col1,col10, col11, col6) VALUES(?,?,?,?)"))
+
+       if (!$stmt = mysqli_prepare($link, "INSERT INTO insert_read(col1,col10, col11, col6) VALUES (?,?,?,?)"))
                printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-       
+
        mysqli_bind_param($stmt, "issd", $c1, $c2, $c3, $c4);
 
        $c1 = 1;
@@ -38,10 +38,10 @@ require_once('skipifconnectfailure.inc');
        mysqli_execute($stmt);
        mysqli_stmt_close($stmt);
 
-       if (!$stmt = mysqli_prepare($link, "SELECT col1, col2, col3, col4, col5, col6, col7, col8, col9, col10, col11 from insert_read"))
+       if (!$stmt = mysqli_prepare($link, "SELECT col1, col2, col3, col4, col5, col6, col7, col8, col9, col10, col11 FROM insert_read"))
                printf("[004] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
-               
-       mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7, $c8, $c9, $c10, $c11); 
+
+       mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7, $c8, $c9, $c10, $c11);
        mysqli_execute($stmt);
 
        mysqli_fetch($stmt);
@@ -51,6 +51,7 @@ require_once('skipifconnectfailure.inc');
        var_dump($test);
 
        mysqli_stmt_close($stmt);
+       mysqli_query($link, "DROP TABLE IF EXISTS insert_read");
        mysqli_close($link);
        print "done!";
 ?>

diff --git a/ext/mysqli/tests/020.phpt b/ext/mysqli/tests/020.phpt
index 4399391abedbffc58a902578f24c68cedb5e3565..851ccde31bec71c3cb50fd7166de87711f4bb431 100644 (file)
--- a/ext/mysqli/tests/020.phpt
+++ b/ext/mysqli/tests/020.phpt
@@ -66,6 +66,7 @@ require_once('skipifconnectfailure.inc');
        var_dump($test);
 
        mysqli_stmt_close($stmt);
+       mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result");
        mysqli_close($link);
 
        print "done!";

diff --git a/ext/mysqli/tests/021.phpt b/ext/mysqli/tests/021.phpt
index f2737ad81ac4e67abbf4e5e783d3d95f0c0bdcb7..955af29558557eaa40560c7e0388b9e5b61a6e9e 100644 (file)
--- a/ext/mysqli/tests/021.phpt
+++ b/ext/mysqli/tests/021.phpt
@@ -1,8 +1,8 @@
 --TEST--
 mysqli bind_param+bind_result char/text
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -34,6 +34,7 @@ require_once('skipifconnectfailure.inc');
        var_dump($test);
 
        mysqli_stmt_close($stmt);
+       mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");
        mysqli_close($link);
        print "done!";
 ?>

diff --git a/ext/mysqli/tests/022.phpt b/ext/mysqli/tests/022.phpt
index 14ea46eea62e62b95ca1e5b3ae02e3130df8e025..0ab5179e85fcc0d549d3049e3b474b8303f59ab4 100644 (file)
--- a/ext/mysqli/tests/022.phpt
+++ b/ext/mysqli/tests/022.phpt
@@ -1,8 +1,8 @@
 --TEST--
 mysqli bind_param/bind_result char/text long
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -38,6 +38,7 @@ require_once('skipifconnectfailure.inc');
        var_dump($test);
 
        mysqli_stmt_close($stmt);
+       mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");
        mysqli_close($link);
 
        print "done!";

diff --git a/ext/mysqli/tests/023.phpt b/ext/mysqli/tests/023.phpt
index 0137f9e373576de2f1130467abe8820ece8594ea..4613a2c471ea685afaa15c2d7dfdeaa77d4a23b4 100644 (file)
--- a/ext/mysqli/tests/023.phpt
+++ b/ext/mysqli/tests/023.phpt
@@ -1,8 +1,8 @@
 --TEST--
 mysqli bind_param/bind_prepare fetch long values
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -47,6 +47,7 @@ require_once('skipifconnectfailure.inc');
        var_dump($test);
 
        mysqli_stmt_close($stmt);
+       mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");
        mysqli_close($link);
 
        print "done!";

diff --git a/ext/mysqli/tests/024.phpt b/ext/mysqli/tests/024.phpt
index 167cb428e3faf7f8ee36135e67d24b926feba681..e5bcdaf47f0b9b601108b7601b6c52c202651c00 100644 (file)
--- a/ext/mysqli/tests/024.phpt
+++ b/ext/mysqli/tests/024.phpt
@@ -1,8 +1,8 @@
 --TEST--
 mysqli bind_param/bind_result short values
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -48,6 +48,7 @@ require_once('skipifconnectfailure.inc');
        var_dump($test);
 
        mysqli_stmt_close($stmt);
+       mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");
        mysqli_close($link);
        print "done!";
 ?>

diff --git a/ext/mysqli/tests/025.phpt b/ext/mysqli/tests/025.phpt
index 7d31342fecea7afe2dcbfe080a64eb88ca616877..8f419ae35c3805d037b52b7fbc2b2398933287ee 100644 (file)
--- a/ext/mysqli/tests/025.phpt
+++ b/ext/mysqli/tests/025.phpt
@@ -1,8 +1,8 @@
 --TEST--
 mysqli bind_param/bind_result tinyint values
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -52,6 +52,7 @@ require_once('skipifconnectfailure.inc');
        var_dump($test);
 
        mysqli_stmt_close($stmt);
+       mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");
        mysqli_close($link);
 
        print "done!";

diff --git a/ext/mysqli/tests/026.phpt b/ext/mysqli/tests/026.phpt
index ac728872a4ca3ca0481b9ca28c4ccff73e09ffd0..ebf94fa5ace0c55a2fd6ebaf736a066d6f1022e2 100644 (file)
--- a/ext/mysqli/tests/026.phpt
+++ b/ext/mysqli/tests/026.phpt
@@ -1,8 +1,8 @@
 --TEST--
 mysqli bind_param/bind_result with send_long_data
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -40,7 +40,7 @@ require_once('skipifconnectfailure.inc');
        var_dump($test);
 
        mysqli_stmt_close($stmt);
-
+       mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");
        mysqli_close($link);
        print "done!";
 --EXPECTF--

diff --git a/ext/mysqli/tests/029.phpt b/ext/mysqli/tests/029.phpt
index 8e1a922dfc5b9b70e76b16e6ca540d58c1df499a..b282e7c2eef91588bb0bd202b59e39e7c2c94a09 100644 (file)
--- a/ext/mysqli/tests/029.phpt
+++ b/ext/mysqli/tests/029.phpt
@@ -1,8 +1,8 @@
 --TEST--
 function test: mysqli_affected_rows
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -14,14 +14,15 @@ require_once('skipifconnectfailure.inc');
 
        mysqli_select_db($link, $db);
 
-       mysqli_query($link, "drop table if exists general_test");
-       mysqli_query($link, "create table general_test (a int)");
-       mysqli_query($link, "insert into general_test values (1),(2),(3)");
+       mysqli_query($link, "DROP TABLE IF EXISTS exists general_test");
+       mysqli_query($link, "CREATE TABLE general_test (a INT)");
+       mysqli_query($link, "INSERT INTO general_test VALUES (1),(2),(3)");
 
        $afc = mysqli_affected_rows($link);
 
        var_dump($afc);
 
+       mysqli_query($link, "DROP TABLE IF EXISTS exists general_test");
        mysqli_close($link);
        print "done!";
 ?>

diff --git a/ext/mysqli/tests/030.phpt b/ext/mysqli/tests/030.phpt
index f00c28fd8e585f1a86250b21fc11d2f1353efebc..af0210c87099bd3442f42ad6ad0c0e07f267d6d0 100644 (file)
--- a/ext/mysqli/tests/030.phpt
+++ b/ext/mysqli/tests/030.phpt
@@ -1,8 +1,8 @@
 --TEST--
 function test: mysqli_errno
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -14,9 +14,9 @@ require_once('skipifconnectfailure.inc');
        $errno = mysqli_errno($link);
        var_dump($errno);
 
-       mysqli_select_db($link, "test");
+       mysqli_select_db($link, $db);
 
-       mysqli_query($link, "select * from non_exisiting_table");
+       mysqli_query($link, "SELECT * FROM non_exisiting_table");
        $errno = mysqli_errno($link);
 
        var_dump($errno);

diff --git a/ext/mysqli/tests/031.phpt b/ext/mysqli/tests/031.phpt
index c6ebbe3e401b35f87e17d432e84b267fddead1b6..198224d3a9687dfec1b6d66799137004296484ba 100644 (file)
--- a/ext/mysqli/tests/031.phpt
+++ b/ext/mysqli/tests/031.phpt
@@ -1,8 +1,8 @@
 --TEST--
 function test: mysqli_error
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -16,7 +16,7 @@ require_once('skipifconnectfailure.inc');
 
        mysqli_select_db($link, $db);
 
-       mysqli_query($link, "select * from non_exisiting_table");
+       mysqli_query($link, "SELECT * FROM non_exisiting_table");
        $error = mysqli_error($link);
 
        var_dump($error);

diff --git a/ext/mysqli/tests/032.phpt b/ext/mysqli/tests/032.phpt
index f902e1d000534ff5278036a16858d8743a80dbd4..9c6da6706b1ce7bcf8e4d0e8193bf2907204bb92 100644 (file)
--- a/ext/mysqli/tests/032.phpt
+++ b/ext/mysqli/tests/032.phpt
@@ -1,8 +1,8 @@
 --TEST--
 function test: mysqli_info
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -14,14 +14,15 @@ require_once('skipifconnectfailure.inc');
 
        mysqli_select_db($link, $db);
 
-       mysqli_query($link, "drop table if exists general_test");
-       mysqli_query($link, "create table general_test (a int)");
-       mysqli_query($link, "insert into general_test values (1),(2),(3)");
+       mysqli_query($link, "DROP TABLE IF EXISTS general_test");
+       mysqli_query($link, "CREATE TABLE general_test (a INT)");
+       mysqli_query($link, "INSERT INTO general_test VALUES (1),(2),(3)");
 
        $afc = mysqli_info($link);
 
        var_dump($afc);
 
+       mysqli_query($link, "DROP TABLE IF EXISTS general_test");
        mysqli_close($link);
        print "done!";
 ?>

diff --git a/ext/mysqli/tests/036.phpt b/ext/mysqli/tests/036.phpt
index 6bbcd7da1b600d63dc1f52eae7c67fe61a350761..45b5fda5a8777a24efcf6301bba9ae46ccccac1a 100644 (file)
--- a/ext/mysqli/tests/036.phpt
+++ b/ext/mysqli/tests/036.phpt
@@ -11,7 +11,6 @@ function test: mysqli_insert_id()
 ?>
 --FILE--
 <?php
-
        include "connect.inc";
 
        /*** test mysqli_connect 127.0.0.1 ***/
@@ -20,9 +19,7 @@ function test: mysqli_insert_id()
        mysqli_select_db($link, $db);
 
        mysqli_query($link, "DROP TABLE IF EXISTS t036");
-
-       mysqli_query($link, "CREATE TABLE t036 (a bigint not null auto_increment primary key, b varchar(10))");
-
+       mysqli_query($link, "CREATE TABLE t036 (a bigint not null auto_increment primary key, b varchar(10)) ENGINE = " . $engine);
 
        mysqli_query($link, "INSERT INTO t036 (b) VALUES ('foo1')");
        $test[] = mysqli_insert_id($link);
@@ -41,6 +38,7 @@ function test: mysqli_insert_id()
 
        var_dump($test);
 
+       mysqli_query($link, "DROP TABLE IF EXISTS t036");
        mysqli_close($link);
        print "done!";
 ?>

diff --git a/ext/mysqli/tests/037.phpt b/ext/mysqli/tests/037.phpt
index a7c218c2c51702a47d510a36a2a55f83f3f86cdf..cb721e08a6b28d11be4ee56f4d68d5152762dfd2 100644 (file)
--- a/ext/mysqli/tests/037.phpt
+++ b/ext/mysqli/tests/037.phpt
@@ -1,8 +1,8 @@
 --TEST--
 function test: mysqli_field_count()
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -17,7 +17,7 @@ require_once('skipifconnectfailure.inc');
 
        mysqli_query($link, "DROP TABLE IF EXISTS test_result");
 
-       mysqli_query($link, "CREATE TABLE test_result (a int, b varchar(10))");
+       mysqli_query($link, "CREATE TABLE test_result (a int, b varchar(10)) ENGINE = " . $engine);
 
        mysqli_query($link, "INSERT INTO test_result VALUES (1, 'foo')");
        $ir[] = mysqli_field_count($link);
@@ -28,6 +28,7 @@ require_once('skipifconnectfailure.inc');
 
        var_dump($ir);
 
+       mysqli_query($link, "DROP TABLE IF EXISTS test_result");
        mysqli_close($link);
        print "done!";
 ?>

diff --git a/ext/mysqli/tests/038.phpt b/ext/mysqli/tests/038.phpt
index 297e1d39898049c7c41a81b7015aafa246db94ec..bc3c544191c07873f8937b5c670acd3ba3fe0b72 100644 (file)
--- a/ext/mysqli/tests/038.phpt
+++ b/ext/mysqli/tests/038.phpt
@@ -1,15 +1,15 @@
 --TEST--
 function test: mysqli_num_fields()
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
 
        include "connect.inc";
-       
+
        /*** test mysqli_connect 127.0.0.1 ***/
        $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
@@ -17,7 +17,7 @@ require_once('skipifconnectfailure.inc');
 
        mysqli_query($link, "DROP TABLE IF EXISTS test_result");
 
-       mysqli_query($link, "CREATE TABLE test_result (a int, b varchar(10))");
+       mysqli_query($link, "CREATE TABLE test_result (a int, b varchar(10)) ENGINE = " . $engine);
 
        mysqli_query($link, "INSERT INTO test_result VALUES (1, 'foo')");
 
@@ -30,6 +30,7 @@ require_once('skipifconnectfailure.inc');
 
        var_dump($num);
 
+       mysqli_query($link, "DROP TABLE IF EXISTS test_result");
        mysqli_close($link);
 ?>
 --EXPECT--

diff --git a/ext/mysqli/tests/039.phpt b/ext/mysqli/tests/039.phpt
index 60b4a711e1d314e20f4c8056773bd5b0fee59369..173c1922278c581a886f41a67705b197ed85ff29 100644 (file)
--- a/ext/mysqli/tests/039.phpt
+++ b/ext/mysqli/tests/039.phpt
@@ -1,8 +1,8 @@
 --TEST--
 function test: mysqli_num_fields() 2
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--

diff --git a/ext/mysqli/tests/040.phpt b/ext/mysqli/tests/040.phpt
index fa1754a562bdf9d2132c5c7c9bfe3dea7d12c4e5..675d3451883ea830ea7023cc09ae65529e110d70 100644 (file)
--- a/ext/mysqli/tests/040.phpt
+++ b/ext/mysqli/tests/040.phpt
@@ -1,13 +1,12 @@
 --TEST--
 function test: mysqli_num_rows()
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
-
        include "connect.inc";
 
        /*** test mysqli_connect 127.0.0.1 ***/
@@ -16,9 +15,7 @@ require_once('skipifconnectfailure.inc');
        mysqli_select_db($link, $db);
 
        mysqli_query($link, "DROP TABLE IF EXISTS test_result");
-
-       mysqli_query($link, "CREATE TABLE test_result (a int, b varchar(10))");
-
+       mysqli_query($link, "CREATE TABLE test_result (a int, b varchar(10)) ENGINE=" . $engine);
        mysqli_query($link, "INSERT INTO test_result VALUES (1, 'foo')");
 
        mysqli_real_query($link, "SELECT * FROM test_result");
@@ -30,6 +27,7 @@ require_once('skipifconnectfailure.inc');
 
        var_dump($num);
 
+       mysqli_query($link, "DROP TABLE IF EXISTS test_result");
        mysqli_close($link);
        print "done!";
 ?>

diff --git a/ext/mysqli/tests/042.phpt b/ext/mysqli/tests/042.phpt
index bb622b3e30cd72c85e286e29da0ba303da55b74c..6f82636677a7a2c3ce8b0b6a6195b5ad4c3e610e 100644 (file)
--- a/ext/mysqli/tests/042.phpt
+++ b/ext/mysqli/tests/042.phpt
@@ -1,8 +1,8 @@
 --TEST--
 mysqli_fetch_object
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -22,7 +22,7 @@ require_once('skipifconnectfailure.inc');
                c4 smallint,
                c5 smallint,
                c6 smallint unsigned,
-               c7 smallint)");
+               c7 smallint) ENGINE=" . $engine);
 
        $stmt = mysqli_prepare($link, "INSERT INTO test_bind_fetch VALUES (?,?,?,?,?,?,?)");
        mysqli_bind_param($stmt, "iiiiiii", $c1,$c2,$c3,$c4,$c5,$c6,$c7);
@@ -44,6 +44,7 @@ require_once('skipifconnectfailure.inc');
 
        var_dump($test);
 
+       mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");
        mysqli_close($link);
        print "done!"
 ?>

diff --git a/ext/mysqli/tests/043.phpt b/ext/mysqli/tests/043.phpt
index b5038ffb2a65e8686c1083a7da62bcd494d4527a..f83908e5bbf468d16a2bf60ff5967b65e45617f0 100644 (file)
--- a/ext/mysqli/tests/043.phpt
+++ b/ext/mysqli/tests/043.phpt
@@ -1,8 +1,8 @@
 --TEST--
 mysqli_bind_param (UPDATE)
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -16,7 +16,7 @@ require_once('skipifconnectfailure.inc');
 
        mysqli_query($link,"DROP TABLE IF EXISTS test_update");
        mysqli_query($link,"CREATE TABLE test_update(a varchar(10),
-                                                     b int)");
+               b int) ENGINE=" . $engine);
 
        mysqli_query($link, "INSERT INTO test_update VALUES ('foo', 2)");
 
@@ -36,6 +36,7 @@ require_once('skipifconnectfailure.inc');
 
        var_dump($test);
 
+       mysqli_query($link, "DROP TABLE IF EXISTS test_update");
        mysqli_close($link);
        print "done!";
 ?>

diff --git a/ext/mysqli/tests/046.phpt b/ext/mysqli/tests/046.phpt
index 9fcf321eef343cfed7f073836f2cdfa99dd65e92..a08a9349edf4c9ba2a258e940bb69fc349f93088 100644 (file)
--- a/ext/mysqli/tests/046.phpt
+++ b/ext/mysqli/tests/046.phpt
@@ -1,8 +1,8 @@
 --TEST--
 mysqli_stmt_affected_rows (delete)
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -15,7 +15,7 @@ require_once('skipifconnectfailure.inc');
        mysqli_select_db($link, $db);
 
        mysqli_query($link, "DROP TABLE IF EXISTS test_affected");
-       mysqli_query($link, "CREATE TABLE test_affected (foo int)");
+       mysqli_query($link, "CREATE TABLE test_affected (foo int) ENGINE=" . $engine);
 
        mysqli_query($link, "INSERT INTO test_affected VALUES (1),(2),(3),(4),(5)");
 
@@ -30,6 +30,7 @@ require_once('skipifconnectfailure.inc');
        mysqli_stmt_close($stmt);
        var_dump($x==1);
 
+       mysqli_query($link, "DROP TABLE IF EXISTS test_affected");
        mysqli_close($link);
        print "done!";
 ?>

diff --git a/ext/mysqli/tests/047.phpt b/ext/mysqli/tests/047.phpt
index 0bc43ce501cd9a86bbbcccc242c50d9a5b4c3c30..db24ec44b52de9c1703f8161f50d8858badced46 100644 (file)
--- a/ext/mysqli/tests/047.phpt
+++ b/ext/mysqli/tests/047.phpt
@@ -15,7 +15,7 @@ require_once('skipifconnectfailure.inc');
        mysqli_select_db($link, $db);
 
        mysqli_query($link, "DROP TABLE IF EXISTS test_affected");
-       mysqli_query($link, "CREATE TABLE test_affected (foo int, bar varchar(10) character set latin1)");
+       mysqli_query($link, "CREATE TABLE test_affected (foo int, bar varchar(10) character set latin1) ENGINE=" . $engine);
 
        mysqli_query($link, "INSERT INTO test_affected VALUES (1, 'Zak'),(2, 'Greant')");
 
@@ -41,6 +41,7 @@ require_once('skipifconnectfailure.inc');
 
 
        mysqli_stmt_close($stmt);
+       mysqli_query($link, "DROP TABLE IF EXISTS test_affected");
        mysqli_close($link);
        print "done!";
 ?>

diff --git a/ext/mysqli/tests/048.phpt b/ext/mysqli/tests/048.phpt
index afd4799b8358f173dc39340b420eef4163df3182..73a6712fbca49376e7d719dc66e6fd1ccc046a63 100644 (file)
--- a/ext/mysqli/tests/048.phpt
+++ b/ext/mysqli/tests/048.phpt
@@ -1,8 +1,8 @@
 --TEST--
 mysqli bind_result (OO-Style)
 --SKIPIF--
-<?php 
-require_once('skipif.inc'); 
+<?php
+require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
@@ -21,7 +21,7 @@ require_once('skipifconnectfailure.inc');
                col7 date, col8 time,
                col9 varbinary(10),
                col10 varchar(50),
-               col11 char(20))");
+               col11 char(20)) ENGINE=" . $engine);
 
        $mysql->query("INSERT INTO test_fetch_null(col1,col10, col11) VALUES(1,'foo1', 1000),(2,'foo2', 88),(3,'foo3', 389789)");
 
@@ -36,6 +36,7 @@ require_once('skipifconnectfailure.inc');
        var_dump($test);
 
        $stmt->close();
+       $mysql->query("DROP TABLE IF EXISTS test_fetch_null");
        $mysql->close();
        print "done!";
 ?>

diff --git a/ext/mysqli/tests/061.phpt b/ext/mysqli/tests/061.phpt
index aca0b7a764a6211c48b14726845cde3fe18bc815..22575aaeccc6bdd1f4ede774b8428d277b9ad399 100644 (file)
--- a/ext/mysqli/tests/061.phpt
+++ b/ext/mysqli/tests/061.phpt
@@ -20,7 +20,7 @@ if (!function_exists('mysqli_set_local_infile_handler'))
        $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
        /* create temporary file */
-       $filename = dirname(__FILE__) . "/061.csv";
+       $filename = dirname(__FILE__) . "061.csv";
        $fp = fopen($filename, "w");
        fwrite($fp, b"foo;bar");
        fclose($fp);