Merge from head: do not use deprecated function aliases. The test logic is unchanged.

diff --git a/ext/mysqli/tests/002.phpt b/ext/mysqli/tests/002.phpt
index c18310871ef74a1133606f9738803977f6d1b200..522c99e800955b8edd342b00cbbb9e3d129cc0d8 100644 (file)
--- a/ext/mysqli/tests/002.phpt
+++ b/ext/mysqli/tests/002.phpt
@@ -32,10 +32,10 @@ require_once('skipifconnectfailure.inc');
                printf("[004] Cannot insert records, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
        $stmt = mysqli_prepare($link, "SELECT col1, col2, col3, col4, col5, col6, col7, col8, col9, col10, col11 from test_fetch_null ORDER BY col1");
-       mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7, $c8, $c9, $c10, $c11);
-       mysqli_execute($stmt);
+       mysqli_stmt_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7, $c8, $c9, $c10, $c11);
+       mysqli_stmt_execute($stmt);
 
-       mysqli_fetch($stmt);
+       mysqli_stmt_fetch($stmt);
 
        $test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7,$c8,$c9,$c10,$c11);
 

diff --git a/ext/mysqli/tests/003.phpt b/ext/mysqli/tests/003.phpt
index 9094c86a76a3b1649507387761480b41ae305334..9374763862e600e2f2e34d73c7a5f36a25c6ec78 100644 (file)
--- a/ext/mysqli/tests/003.phpt
+++ b/ext/mysqli/tests/003.phpt
@@ -59,9 +59,9 @@ require_once('skipifconnectfailure.inc');
                printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
        $stmt = mysqli_prepare($link, "SELECT c1, c2, c3, c4, c5, c6, c7 FROM test_bind_result");
-       mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7);
-       mysqli_execute($stmt);
-       mysqli_fetch($stmt);
+       mysqli_stmt_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7);
+       mysqli_stmt_execute($stmt);
+       mysqli_stmt_fetch($stmt);
 
        $test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7);
 

diff --git a/ext/mysqli/tests/004.phpt b/ext/mysqli/tests/004.phpt
index 184eceaa891bed72375a04fd0e94142f41e5b14a..ce222fea42f418e57528bf62b9cab451ac391458 100644 (file)
--- a/ext/mysqli/tests/004.phpt
+++ b/ext/mysqli/tests/004.phpt
@@ -33,11 +33,11 @@ require_once('skipifconnectfailure.inc');
                printf("[006] [%d] string\n", mysqli_errno($link), mysqli_error($link));
 
        $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch ORDER BY c1");
-       mysqli_bind_result($stmt, $c1, $c2);
-       mysqli_execute($stmt);
+       mysqli_stmt_bind_result($stmt, $c1, $c2);
+       mysqli_stmt_execute($stmt);
        $i = 4;
        while ($i--) {
-               mysqli_fetch($stmt);
+               mysqli_stmt_fetch($stmt);
                $test = array($c1, $c2);
                var_dump($test);
        }

diff --git a/ext/mysqli/tests/005.phpt b/ext/mysqli/tests/005.phpt
index 0d59f40b7ec339defd2d26232e1fe4fccfd165c7..07292a1f3ebe1d44a8ce5411248a9f3a485976f2 100644 (file)
--- a/ext/mysqli/tests/005.phpt
+++ b/ext/mysqli/tests/005.phpt
@@ -23,9 +23,9 @@ require_once('skipifconnectfailure.inc');
        mysqli_query($link, "INSERT INTO test_bind_fetch VALUES ('1234567890', '$a')");
 
        $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch");
-       mysqli_bind_result($stmt, $c1, $c2);
-       mysqli_execute($stmt);
-       mysqli_fetch($stmt);
+       mysqli_stmt_bind_result($stmt, $c1, $c2);
+       mysqli_stmt_execute($stmt);
+       mysqli_stmt_fetch($stmt);
 
        $test[] = $c1;
        $test[] = ($a == $c2) ? "32K String ok" : "32K String failed";
@@ -33,7 +33,7 @@ require_once('skipifconnectfailure.inc');
        var_dump($test);
 
        /* this will crash with libmysql from PHP 5.0.6 (or earlier) to 5.3.0 */
-       mysqli_fetch($stmt);
+       mysqli_stmt_fetch($stmt);
 
        mysqli_stmt_close($stmt);
        mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");

diff --git a/ext/mysqli/tests/006.phpt b/ext/mysqli/tests/006.phpt
index 497426598cbb2b17026107ed184862d63ea53db6..2043cc5d0765d780622adf75e75c1a43eb28088f 100644 (file)
--- a/ext/mysqli/tests/006.phpt
+++ b/ext/mysqli/tests/006.phpt
@@ -32,9 +32,9 @@ require_once('skipifconnectfailure.inc');
                printf("[004] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
        $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch");
-       mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7);
-       mysqli_execute($stmt);
-       mysqli_fetch($stmt);
+       mysqli_stmt_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7);
+       mysqli_stmt_execute($stmt);
+       mysqli_stmt_fetch($stmt);
 
        $test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7);
 

diff --git a/ext/mysqli/tests/007.phpt b/ext/mysqli/tests/007.phpt
index 05a8ae5bafe275c590ea795eb4d31a1d1350da9b..26b5763bb4877d145a455db8c79051fb10e1145d 100644 (file)
--- a/ext/mysqli/tests/007.phpt
+++ b/ext/mysqli/tests/007.phpt
@@ -32,9 +32,9 @@ require_once('skipifconnectfailure.inc');
                printf("[004] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
        $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch");
-       mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7);
-       mysqli_execute($stmt);
-       mysqli_fetch($stmt);
+       mysqli_stmt_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7);
+       mysqli_stmt_execute($stmt);
+       mysqli_stmt_fetch($stmt);
 
        $test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7);
 

diff --git a/ext/mysqli/tests/008.phpt b/ext/mysqli/tests/008.phpt
index ba0e3408914b585bed5fae7c76cb09fa124ab6f9..0ae09df842d0c0b729bd38bf2d9551ccc1894ad2 100644 (file)
--- a/ext/mysqli/tests/008.phpt
+++ b/ext/mysqli/tests/008.phpt
@@ -32,9 +32,9 @@ require_once('skipifconnectfailure.inc');
                printf("[004] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
        $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch");
-       mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7);
-       mysqli_execute($stmt);
-       mysqli_fetch($stmt);
+       mysqli_stmt_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7);
+       mysqli_stmt_execute($stmt);
+       mysqli_stmt_fetch($stmt);
 
        $test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7);
 

diff --git a/ext/mysqli/tests/009.phpt b/ext/mysqli/tests/009.phpt
index 3e26f518ad26c285e2ca4209bd18c14db65982ba..30d42c39a6b0315efa6037d8af591ea9a2a2b9cf 100644 (file)
--- a/ext/mysqli/tests/009.phpt
+++ b/ext/mysqli/tests/009.phpt
@@ -39,9 +39,9 @@ mysqli fetch bigint values (ok to fail with 4.1.x)
                printf("[004] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
        $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch");
-       mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7, $c8);
-       mysqli_execute($stmt);
-       $rc = mysqli_fetch($stmt);
+       mysqli_stmt_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7, $c8);
+       mysqli_stmt_execute($stmt);
+       $rc = mysqli_stmt_fetch($stmt);
 
        if (mysqli_get_server_version($link) < 50000) {
                // 4.1 is faulty and will return big number for $c6
@@ -66,9 +66,9 @@ mysqli fetch bigint values (ok to fail with 4.1.x)
                printf("[007] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
        $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch_uint");
-       mysqli_bind_result($stmt, $c1, $c2);
-       mysqli_execute($stmt);
-       $rc = mysqli_fetch($stmt);
+       mysqli_stmt_bind_result($stmt, $c1, $c2);
+       mysqli_stmt_execute($stmt);
+       $rc = mysqli_stmt_fetch($stmt);
 
        echo $c1, "\n", $c2, "\n";
 

diff --git a/ext/mysqli/tests/010.phpt b/ext/mysqli/tests/010.phpt
index fab0c578896723190f44a1f76fa547cf952b947a..60ff8eac19bc9e6212fcb40e332939ca45ff274a 100644 (file)
--- a/ext/mysqli/tests/010.phpt
+++ b/ext/mysqli/tests/010.phpt
@@ -35,9 +35,9 @@ require_once('skipifconnectfailure.inc');
                                                                                        sin(0.6), 1.00000000000001, 888888888888888)");
 
        $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch");
-       mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7);
-       mysqli_execute($stmt);
-       mysqli_fetch($stmt);
+       mysqli_stmt_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7);
+       mysqli_stmt_execute($stmt);
+       mysqli_stmt_fetch($stmt);
 
        $test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7);
 

diff --git a/ext/mysqli/tests/011.phpt b/ext/mysqli/tests/011.phpt
index 83f35e5869b8b6ec160e98fffbeda7924f5c47c4..db03abac83f91e61de4630e2ed73c3bd495672a7 100644 (file)
--- a/ext/mysqli/tests/011.phpt
+++ b/ext/mysqli/tests/011.phpt
@@ -32,9 +32,9 @@ require_once('skipifconnectfailure.inc');
                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);
-       mysqli_fetch($stmt);
+       mysqli_stmt_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7, $c8);
+       mysqli_stmt_execute($stmt);
+       mysqli_stmt_fetch($stmt);
 
        $test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7,$c8);
 

diff --git a/ext/mysqli/tests/012.phpt b/ext/mysqli/tests/012.phpt
index da4a48ab5131b17669abf39ae0efb5c94825f824..7cc34b0c00ec7ccd1f32813d8555a855f9af7e9e 100644 (file)
--- a/ext/mysqli/tests/012.phpt
+++ b/ext/mysqli/tests/012.phpt
@@ -31,9 +31,9 @@ require_once('skipifconnectfailure.inc');
                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);
-       mysqli_fetch($stmt);
+       mysqli_stmt_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7, $c8);
+       mysqli_stmt_execute($stmt);
+       mysqli_stmt_fetch($stmt);
 
        $test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7,$c8);
 

diff --git a/ext/mysqli/tests/013.phpt b/ext/mysqli/tests/013.phpt
index 5ddb49632ae2dad79ea337c781c8c8d9b0a386de..6d75bde7319dd3cf06f5626befca6a2f5fe7aa61 100644 (file)
--- a/ext/mysqli/tests/013.phpt
+++ b/ext/mysqli/tests/013.phpt
@@ -31,10 +31,10 @@ require_once('skipifconnectfailure.inc');
        $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_result");
 
        $c = array(0,0,0,0,0,0,0,0);
-       $b_res= mysqli_bind_result($stmt, $c[0], $c[1], $c[2], $c[3], $c[4], $c[5], $c[6], $c[7]);
-       mysqli_execute($stmt);
-       mysqli_fetch($stmt);
-       mysqli_fetch($stmt);
+       $b_res= mysqli_stmt_bind_result($stmt, $c[0], $c[1], $c[2], $c[3], $c[4], $c[5], $c[6], $c[7]);
+       mysqli_stmt_execute($stmt);
+       mysqli_stmt_fetch($stmt);
+       mysqli_stmt_fetch($stmt);
        mysqli_stmt_close($stmt);
 
        $result = mysqli_query($link, "select * from test_bind_result");

diff --git a/ext/mysqli/tests/016.phpt b/ext/mysqli/tests/016.phpt
index ce1ea83062e3f9d54bd818d7a14ec793572f26f8..8e1ffe6200bcbbb3a1f250c2985d05876aa3faea 100644 (file)
--- a/ext/mysqli/tests/016.phpt
+++ b/ext/mysqli/tests/016.phpt
@@ -18,9 +18,9 @@ require_once('skipifconnectfailure.inc');
        if (!$stmt = mysqli_prepare($link, "SELECT @dummy"))
                printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
-       mysqli_bind_result($stmt, $dummy);
-       mysqli_execute($stmt);
-       mysqli_fetch($stmt);
+       mysqli_stmt_bind_result($stmt, $dummy);
+       mysqli_stmt_execute($stmt);
+       mysqli_stmt_fetch($stmt);
 
        var_dump($dummy);
 

diff --git a/ext/mysqli/tests/017.phpt b/ext/mysqli/tests/017.phpt
index a48ae5c9d6ad6b09bb44dfe3dd6ff9ea025cca55..082202f528aac3a0d218a3355164c2797bf7b53c 100644 (file)
--- a/ext/mysqli/tests/017.phpt
+++ b/ext/mysqli/tests/017.phpt
@@ -16,10 +16,10 @@ require_once('skipifconnectfailure.inc');
        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_execute($stmt);
+       mysqli_stmt_bind_result($stmt, $c0, $c1, $c2);
+       mysqli_stmt_execute($stmt);
 
-       mysqli_fetch($stmt);
+       mysqli_stmt_fetch($stmt);
        mysqli_stmt_close($stmt);
 
        $test = array($c0, $c1, $c2);

diff --git a/ext/mysqli/tests/018.phpt b/ext/mysqli/tests/018.phpt
index 87476442d2c014cc9f2844df0b1ae69b7dd83aab..d5466e22419df101f940ae72b7bcf12c7665e52b 100644 (file)
--- a/ext/mysqli/tests/018.phpt
+++ b/ext/mysqli/tests/018.phpt
@@ -18,10 +18,10 @@ require_once('skipifconnectfailure.inc');
        if (!$stmt = mysqli_prepare($link, "SELECT @@autocommit"))
                printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
-       mysqli_bind_result($stmt, $c0);
-       mysqli_execute($stmt);
+       mysqli_stmt_bind_result($stmt, $c0);
+       mysqli_stmt_execute($stmt);
 
-       mysqli_fetch($stmt);
+       mysqli_stmt_fetch($stmt);
 
        var_dump($c0);
 

diff --git a/ext/mysqli/tests/019.phpt b/ext/mysqli/tests/019.phpt
index 51cf973324756af4f9ea81717a4b40c00e96d057..5e6aac0f0b0cae036fb3a310e9b4100179735a26 100644 (file)
--- a/ext/mysqli/tests/019.phpt
+++ b/ext/mysqli/tests/019.phpt
@@ -28,23 +28,23 @@ require_once('skipifconnectfailure.inc');
        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);
+       mysqli_stmt_bind_param($stmt, "issd", $c1, $c2, $c3, $c4);
 
        $c1 = 1;
        $c2 = "foo";
        $c3 = "foobar";
        $c4 = 3.14;
 
-       mysqli_execute($stmt);
+       mysqli_stmt_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"))
                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_execute($stmt);
+       mysqli_stmt_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7, $c8, $c9, $c10, $c11);
+       mysqli_stmt_execute($stmt);
 
-       mysqli_fetch($stmt);
+       mysqli_stmt_fetch($stmt);
 
        $test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7,$c8,$c9,$c10,$c11);
 

diff --git a/ext/mysqli/tests/020.phpt b/ext/mysqli/tests/020.phpt
index 6e867d7a0f43f46d7a986a6c71c95af999db892f..6512cd8b9ca745fcc19dc8c2c14459b4e544b91e 100644 (file)
--- a/ext/mysqli/tests/020.phpt
+++ b/ext/mysqli/tests/020.phpt
@@ -37,7 +37,7 @@ require_once('skipifconnectfailure.inc');
                c7 timestamp)");
 
        $stmt = mysqli_prepare($link, "INSERT INTO test_bind_result VALUES (?,?,?,?,?,?,?)");
-       mysqli_bind_param($stmt, "sssssss", $d1, $d2, $d3, $d4, $d5, $d6, $d7);
+       mysqli_stmt_bind_param($stmt, "sssssss", $d1, $d2, $d3, $d4, $d5, $d6, $d7);
 
        $d1 = "2002-01-02";
        $d2 = "12:49:00";
@@ -47,15 +47,15 @@ require_once('skipifconnectfailure.inc');
        $d6 = "2020";
        $d7 = "1999-12-29";
 
-       mysqli_execute($stmt);
+       mysqli_stmt_execute($stmt);
        mysqli_stmt_close($stmt);
 
        $stmt = mysqli_prepare($link, "SELECT c1, c2, c3, c4, c5, c6, c7 FROM test_bind_result");
 
-       mysqli_bind_result($stmt,$c1, $c2, $c3, $c4, $c5, $c6, $c7);
+       mysqli_stmt_bind_result($stmt,$c1, $c2, $c3, $c4, $c5, $c6, $c7);
 
-       mysqli_execute($stmt);
-       mysqli_fetch($stmt);
+       mysqli_stmt_execute($stmt);
+       mysqli_stmt_fetch($stmt);
 
        $test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7);
 

diff --git a/ext/mysqli/tests/021.phpt b/ext/mysqli/tests/021.phpt
index 5dec86c90bb61bed164147290fdc6e9f24e1fd84..5ff58c03483ab623aa02ca1b00079ca8a8708128 100644 (file)
--- a/ext/mysqli/tests/021.phpt
+++ b/ext/mysqli/tests/021.phpt
@@ -18,16 +18,16 @@ require_once('skipifconnectfailure.inc');
        mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 char(10), c2 text)");
 
        $stmt = mysqli_prepare($link, "INSERT INTO test_bind_fetch VALUES (?,?)");
-       mysqli_bind_param($stmt, "ss", $q1, $q2);
+       mysqli_stmt_bind_param($stmt, "ss", $q1, $q2);
        $q1 = "1234567890";
        $q2 = "this is a test";
-       mysqli_execute($stmt);
+       mysqli_stmt_execute($stmt);
        mysqli_stmt_close($stmt);
 
        $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch");
-       mysqli_bind_result($stmt, $c1, $c2);
-       mysqli_execute($stmt);
-       mysqli_fetch($stmt);
+       mysqli_stmt_bind_result($stmt, $c1, $c2);
+       mysqli_stmt_execute($stmt);
+       mysqli_stmt_fetch($stmt);
 
        $test = array($c1,$c2);
 

diff --git a/ext/mysqli/tests/022.phpt b/ext/mysqli/tests/022.phpt
index 8e1f0170a5e2f1190140c8b29b14c4623e2b56e4..9cb71c0ea158766acbacba05285a0614ca836eb5 100644 (file)
--- a/ext/mysqli/tests/022.phpt
+++ b/ext/mysqli/tests/022.phpt
@@ -19,18 +19,18 @@ require_once('skipifconnectfailure.inc');
 
 
        $stmt = mysqli_prepare($link, "INSERT INTO test_bind_fetch VALUES (?,?)");
-       mysqli_bind_param($stmt, "ss", $a1, $a2);
+       mysqli_stmt_bind_param($stmt, "ss", $a1, $a2);
 
        $a1 = "1234567890";
        $a2 = str_repeat("A1", 32000);
 
-       mysqli_execute($stmt);
+       mysqli_stmt_execute($stmt);
        mysqli_stmt_close($stmt);
 
        $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch");
-       mysqli_bind_result($stmt, $c1, $c2);
-       mysqli_execute($stmt);
-       mysqli_fetch($stmt);
+       mysqli_stmt_bind_result($stmt, $c1, $c2);
+       mysqli_stmt_execute($stmt);
+       mysqli_stmt_fetch($stmt);
 
        $test[] = $c1;
        $test[] = ($a2 == $c2) ? "32K String ok" : "32K String failed";

diff --git a/ext/mysqli/tests/023.phpt b/ext/mysqli/tests/023.phpt
index 97c7812567b03153c871621835b6c4774b780037..2528519ebd92cae8f31941d495c884e61b47acee 100644 (file)
--- a/ext/mysqli/tests/023.phpt
+++ b/ext/mysqli/tests/023.phpt
@@ -25,7 +25,7 @@ require_once('skipifconnectfailure.inc');
                c7 int)");
 
        $stmt = mysqli_prepare($link, "INSERT INTO test_bind_fetch VALUES (?,?,?,?,?,?,?)");
-       mysqli_bind_param($stmt, "iiiiiii", $c1,$c2,$c3,$c4,$c5,$c6,$c7);
+       mysqli_stmt_bind_param($stmt, "iiiiiii", $c1,$c2,$c3,$c4,$c5,$c6,$c7);
        $c1 = -23;
        $c2 = 35999;
        $c3 = NULL;
@@ -34,13 +34,13 @@ require_once('skipifconnectfailure.inc');
        $c6 = -0;
        $c7 = 0;
 
-       mysqli_execute($stmt);
+       mysqli_stmt_execute($stmt);
        mysqli_stmt_close($stmt);
 
        $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch");
-       mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7);
-       mysqli_execute($stmt);
-       mysqli_fetch($stmt);
+       mysqli_stmt_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7);
+       mysqli_stmt_execute($stmt);
+       mysqli_stmt_fetch($stmt);
 
        $test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7);
 

diff --git a/ext/mysqli/tests/024.phpt b/ext/mysqli/tests/024.phpt
index 2cb93be965dac62b3955f8c5b7905e655052e95a..893ca0dce3851a58633211013b4ff7a418825ae9 100644 (file)
--- a/ext/mysqli/tests/024.phpt
+++ b/ext/mysqli/tests/024.phpt
@@ -25,7 +25,7 @@ require_once('skipifconnectfailure.inc');
                c7 smallint)");
 
        $stmt = mysqli_prepare($link, "INSERT INTO test_bind_fetch VALUES (?,?,?,?,?,?,?)");
-       mysqli_bind_param($stmt, "iiiiiii", $c1,$c2,$c3,$c4,$c5,$c6,$c7);
+       mysqli_stmt_bind_param($stmt, "iiiiiii", $c1,$c2,$c3,$c4,$c5,$c6,$c7);
 
        $c1 = -23;
        $c2 = 35999;
@@ -35,13 +35,13 @@ require_once('skipifconnectfailure.inc');
        $c6 = -0;
        $c7 = 0;
 
-       mysqli_execute($stmt);
+       mysqli_stmt_execute($stmt);
        mysqli_stmt_close($stmt);
 
        $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch");
-       mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7);
-       mysqli_execute($stmt);
-       mysqli_fetch($stmt);
+       mysqli_stmt_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7);
+       mysqli_stmt_execute($stmt);
+       mysqli_stmt_fetch($stmt);
 
        $test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7);
 

diff --git a/ext/mysqli/tests/025.phpt b/ext/mysqli/tests/025.phpt
index 84a9f67a1929c94e220c64cb460f7502c2d95e96..937d6241652d88712c6f06dda55ed90a0ffafa70 100644 (file)
--- a/ext/mysqli/tests/025.phpt
+++ b/ext/mysqli/tests/025.phpt
@@ -25,7 +25,7 @@ require_once('skipifconnectfailure.inc');
                c7 tinyint)");
 
        $stmt = mysqli_prepare ($link, "INSERT INTO test_bind_fetch VALUES(?,?,?,?,?,?,?)");
-       mysqli_bind_param($stmt, "iiiiiii", $c1,$c2,$c3,$c4,$c5,$c6,$c7);
+       mysqli_stmt_bind_param($stmt, "iiiiiii", $c1,$c2,$c3,$c4,$c5,$c6,$c7);
 
        $c1 = -23;
        $c2 = 300;
@@ -35,7 +35,7 @@ require_once('skipifconnectfailure.inc');
        $c6 = 30;
        $c7 = 0;
 
-       mysqli_execute($stmt);
+       mysqli_stmt_execute($stmt);
        mysqli_stmt_close($stmt);
 
        mysqli_query($link, "INSERT INTO test_bind_fetch VALUES (-23,300,0,-100,-127,+30,0)");
@@ -43,9 +43,9 @@ require_once('skipifconnectfailure.inc');
        $c1 = $c2 = $c3 = $c4 = $c5 = $c6 = $c7 = NULL;
 
        $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch");
-       mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7);
-       mysqli_execute($stmt);
-       mysqli_fetch($stmt);
+       mysqli_stmt_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7);
+       mysqli_stmt_execute($stmt);
+       mysqli_stmt_fetch($stmt);
 
        $test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7);
 

diff --git a/ext/mysqli/tests/026.phpt b/ext/mysqli/tests/026.phpt
index ec4baa262d0196716b1f3b09163aff29ae173165..47d763a7c364d129980e409c3338528ad1e66e1b 100644 (file)
--- a/ext/mysqli/tests/026.phpt
+++ b/ext/mysqli/tests/026.phpt
@@ -19,21 +19,21 @@ require_once('skipifconnectfailure.inc');
        mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 varchar(10), c2 text)");
 
        $stmt = mysqli_prepare ($link, "INSERT INTO test_bind_fetch VALUES (?,?)");
-       mysqli_bind_param($stmt, "sb", $c1, $c2);
+       mysqli_stmt_bind_param($stmt, "sb", $c1, $c2);
 
        $c1 = "Hello World";
 
-       mysqli_send_long_data($stmt, 1, "This is the first sentence.");
-       mysqli_send_long_data($stmt, 1, " And this is the second sentence.");
-       mysqli_send_long_data($stmt, 1, " And finally this is the last sentence.");
+       mysqli_stmt_send_long_data($stmt, 1, "This is the first sentence.");
+       mysqli_stmt_send_long_data($stmt, 1, " And this is the second sentence.");
+       mysqli_stmt_send_long_data($stmt, 1, " And finally this is the last sentence.");
 
-       mysqli_execute($stmt);
+       mysqli_stmt_execute($stmt);
        mysqli_stmt_close($stmt);
 
        $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch");
-       mysqli_bind_result($stmt, $d1, $d2);
-       mysqli_execute($stmt);
-       mysqli_fetch($stmt);
+       mysqli_stmt_bind_result($stmt, $d1, $d2);
+       mysqli_stmt_execute($stmt);
+       mysqli_stmt_fetch($stmt);
 
        $test = array($d1,$d2);
 

diff --git a/ext/mysqli/tests/042.phpt b/ext/mysqli/tests/042.phpt
index 55da0cd82729f7d6e3f156e93452c69a2759ed41..31f38f7651217c6cad85ebb72ce2ddb3476a8d0a 100644 (file)
--- a/ext/mysqli/tests/042.phpt
+++ b/ext/mysqli/tests/042.phpt
@@ -25,7 +25,7 @@ require_once('skipifconnectfailure.inc');
                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);
+       mysqli_stmt_bind_param($stmt, "iiiiiii", $c1,$c2,$c3,$c4,$c5,$c6,$c7);
 
        $c1 = -23;
        $c2 = 35999;
@@ -35,7 +35,7 @@ require_once('skipifconnectfailure.inc');
        $c6 = -0;
        $c7 = 0;
 
-       mysqli_execute($stmt);
+       mysqli_stmt_execute($stmt);
        mysqli_stmt_close($stmt);
 
        $result = mysqli_query($link, "SELECT * FROM test_bind_fetch");

diff --git a/ext/mysqli/tests/043.phpt b/ext/mysqli/tests/043.phpt
index 5d060b9bbb289d0b03ffca2ab6a77f9ebe7a53fb..c3a9901e4f5bedf17ad475872136b56610e1757c 100644 (file)
--- a/ext/mysqli/tests/043.phpt
+++ b/ext/mysqli/tests/043.phpt
@@ -1,5 +1,5 @@
 --TEST--
-mysqli_bind_param (UPDATE)
+mysqli_stmt_bind_param (UPDATE)
 --SKIPIF--
 <?php
 require_once('skipif.inc');
@@ -21,13 +21,13 @@ require_once('skipifconnectfailure.inc');
        mysqli_query($link, "INSERT INTO test_update VALUES ('foo', 2)");
 
        $stmt = mysqli_prepare($link, "UPDATE test_update SET a=?,b=? WHERE b=?");
-       mysqli_bind_param($stmt, "sii", $c1, $c2, $c3);
+       mysqli_stmt_bind_param($stmt, "sii", $c1, $c2, $c3);
 
        $c1 = "Rasmus";
        $c2 = 1;
        $c3 = 2;
 
-       mysqli_execute($stmt);
+       mysqli_stmt_execute($stmt);
        mysqli_stmt_close($stmt);
 
        $result = mysqli_query($link, "SELECT concat(a, ' is No. ', b) FROM test_update");

diff --git a/ext/mysqli/tests/045.phpt b/ext/mysqli/tests/045.phpt
index 0b1706002eb9a640f02154aae042f370947ad2fd..d11c16636a7994051e5b6d107f143749ddf40c54 100644 (file)
--- a/ext/mysqli/tests/045.phpt
+++ b/ext/mysqli/tests/045.phpt
@@ -1,5 +1,5 @@
 --TEST--
-mysqli_bind_result (SHOW)
+mysqli_stmt_bind_result (SHOW)
 --SKIPIF--
 <?php
        require_once('skipif.inc');
@@ -10,7 +10,7 @@ mysqli_bind_result (SHOW)
        $link = my_mysqli_connect($host, $user, $passwd);
 
        $stmt = mysqli_prepare($link, "SHOW VARIABLES LIKE 'port'");
-       mysqli_execute($stmt);
+       mysqli_stmt_execute($stmt);
 
        if (!$stmt->field_count) {
                printf("skip SHOW command is not supported in prepared statements.");
@@ -26,10 +26,10 @@ mysqli_bind_result (SHOW)
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
        $stmt = mysqli_prepare($link, "SHOW VARIABLES LIKE 'port'");
-       mysqli_execute($stmt);
+       mysqli_stmt_execute($stmt);
 
-       mysqli_bind_result($stmt, $c1, $c2);
-       mysqli_fetch($stmt);
+       mysqli_stmt_bind_result($stmt, $c1, $c2);
+       mysqli_stmt_fetch($stmt);
        mysqli_stmt_close($stmt);
        if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1) && mysqli_get_server_version($link) < 50000) {
                /* variables are binary */

diff --git a/ext/mysqli/tests/046.phpt b/ext/mysqli/tests/046.phpt
index 18c86e31663d4f480cf82131529a78dbfd274028..1abc5e7bb6903fb89f9b8095065acc66dda0dd18 100644 (file)
--- a/ext/mysqli/tests/046.phpt
+++ b/ext/mysqli/tests/046.phpt
@@ -20,11 +20,11 @@ require_once('skipifconnectfailure.inc');
        mysqli_query($link, "INSERT INTO test_affected VALUES (1),(2),(3),(4),(5)");
 
        $stmt = mysqli_prepare($link, "DELETE FROM test_affected WHERE foo=?");
-       mysqli_bind_param($stmt, "i", $c1);
+       mysqli_stmt_bind_param($stmt, "i", $c1);
 
        $c1 = 2;
 
-       mysqli_execute($stmt);
+       mysqli_stmt_execute($stmt);
        $x = mysqli_stmt_affected_rows($stmt);
 
        mysqli_stmt_close($stmt);

diff --git a/ext/mysqli/tests/047.phpt b/ext/mysqli/tests/047.phpt
index 5a86857031edd1185128d8cda7e6162240f46878..65c951c0802713872dbe5f658a53d14af719ab95 100644 (file)
--- a/ext/mysqli/tests/047.phpt
+++ b/ext/mysqli/tests/047.phpt
@@ -1,5 +1,5 @@
 --TEST--
-mysqli_get_metadata
+mysqli_stmt_result_metadata
 --SKIPIF--
 <?php
 require_once('skipif.inc');
@@ -20,8 +20,8 @@ require_once('skipifconnectfailure.inc');
        mysqli_query($link, "INSERT INTO test_affected VALUES (1, 'Zak'),(2, 'Greant')");
 
        $stmt = mysqli_prepare($link, "SELECT * FROM test_affected");
-       mysqli_execute($stmt);
-       $result = mysqli_get_metadata($stmt);
+       mysqli_stmt_execute($stmt);
+       $result = mysqli_stmt_result_metadata($stmt);
 
        echo "\n=== fetch_fields ===\n";
        var_dump(mysqli_fetch_fields($result));

diff --git a/ext/mysqli/tests/050.phpt b/ext/mysqli/tests/050.phpt
index 4e750c9248e9863562118b523695d6a521e34233..448f164be17aab86473190cb27819f1baf75c8be 100644 (file)
--- a/ext/mysqli/tests/050.phpt
+++ b/ext/mysqli/tests/050.phpt
@@ -15,7 +15,7 @@ require_once('skipifconnectfailure.inc');
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
        $stmt = mysqli_prepare($link, "SELECT CURRENT_USER()");
-       mysqli_execute($stmt);
+       mysqli_stmt_execute($stmt);
 
        mysqli_close($link);
        printf("Ok\n");

diff --git a/ext/mysqli/tests/051.phpt b/ext/mysqli/tests/051.phpt
index ac85410bb3db8fa60c1ec26ffc061381e8f2f580..4a766fb34d3482d5728b80684c71857f3d39c1cd 100644 (file)
--- a/ext/mysqli/tests/051.phpt
+++ b/ext/mysqli/tests/051.phpt
@@ -15,7 +15,7 @@ require_once('skipifconnectfailure.inc');
        $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
        $stmt1 = mysqli_prepare($link, "SELECT CURRENT_USER()");
-       mysqli_execute($stmt1);
+       mysqli_stmt_execute($stmt1);
 
        mysqli_close($link);
        @mysqli_stmt_close($stmt1);

diff --git a/ext/mysqli/tests/052.phpt b/ext/mysqli/tests/052.phpt
index 89336ade6039ed8236f9d2d810e510e48903b37d..1d131f1428a9f7e5259a9499cba8f305d63526a9 100644 (file)
--- a/ext/mysqli/tests/052.phpt
+++ b/ext/mysqli/tests/052.phpt
@@ -17,7 +17,7 @@ require_once('skipifconnectfailure.inc');
        $stmt2 = mysqli_prepare($link, "SELECT CURRENT_USER()");
 
        mysqli_close($link);
-       @mysqli_execute($stmt2);
+       @mysqli_stmt_execute($stmt2);
        @mysqli_stmt_close($stmt2);
        printf("Ok\n");
 ?>

diff --git a/ext/mysqli/tests/057.phpt b/ext/mysqli/tests/057.phpt
index 92f82d4e1abc55be506feeb7ab6bf78e428c9f16..8c8b3eeed7d8f504f7cffa314f70b27015c23287 100644 (file)
--- a/ext/mysqli/tests/057.phpt
+++ b/ext/mysqli/tests/057.phpt
@@ -1,5 +1,5 @@
 --TEST--
-mysqli_get_metadata
+mysqli_stmt_result_metadata
 --SKIPIF--
 <?php
 require_once('skipif.inc');
@@ -20,7 +20,7 @@ require_once('skipifconnectfailure.inc');
        mysqli_query($link, "INSERT INTO test_store_result VALUES (1),(2),(3)");
 
        $stmt = mysqli_prepare($link, "SELECT * FROM test_store_result");
-       mysqli_execute($stmt);
+       mysqli_stmt_execute($stmt);
 
        /* this should produce an out of sync error */
        if ($result = mysqli_query($link, "SELECT * FROM test_store_result")) {
@@ -31,20 +31,20 @@ require_once('skipifconnectfailure.inc');
 
        /* now we should try mysqli_stmt_reset() */
        $stmt = mysqli_prepare($link, "SELECT * FROM test_store_result");
-       var_dump(mysqli_execute($stmt));
+       var_dump(mysqli_stmt_execute($stmt));
        var_dump(mysqli_stmt_reset($stmt));
 
        var_dump($stmt = mysqli_prepare($link, "SELECT * FROM test_store_result"));
        if ($IS_MYSQLND && $stmt->affected_rows !== -1)
                        printf("[001] Expecting -1, got %d\n", $stmt->affected_rows);
 
-       var_dump(mysqli_execute($stmt));
+       var_dump(mysqli_stmt_execute($stmt));
        var_dump($stmt = @mysqli_prepare($link, "SELECT * FROM test_store_result"), mysqli_error($link));
        var_dump(mysqli_stmt_reset($stmt));
 
        $stmt = mysqli_prepare($link, "SELECT * FROM test_store_result");
-       mysqli_execute($stmt);
-       $result1 = mysqli_get_metadata($stmt);
+       mysqli_stmt_execute($stmt);
+       $result1 = mysqli_stmt_result_metadata($stmt);
        mysqli_stmt_store_result($stmt);
 
        printf ("Rows: %d\n", mysqli_stmt_affected_rows($stmt));

diff --git a/ext/mysqli/tests/058.phpt b/ext/mysqli/tests/058.phpt
index a8312617c70f455988afe465cec7b44815be2518..3d2eed7fbee03dc7d2e0a6164fa11b9ab24766ff 100644 (file)
--- a/ext/mysqli/tests/058.phpt
+++ b/ext/mysqli/tests/058.phpt
@@ -19,29 +19,29 @@ require_once('skipifconnectfailure.inc');
 
        $stmt = mysqli_prepare($link, "INSERT INTO mbind VALUES (?,?)");
 
-       mysqli_bind_param($stmt, "is", $a, $b);
+       mysqli_stmt_bind_param($stmt, "is", $a, $b);
 
        $a = 1;
        $b = "foo";
 
-       mysqli_execute($stmt);
+       mysqli_stmt_execute($stmt);
 
-       mysqli_bind_param($stmt, "is", $c, $d);
+       mysqli_stmt_bind_param($stmt, "is", $c, $d);
 
        $c = 2;
        $d = "bar";
 
-       mysqli_execute($stmt);
+       mysqli_stmt_execute($stmt);
        mysqli_stmt_close($stmt);
 
        $stmt = mysqli_prepare($link, "SELECT * FROM mbind");
-       mysqli_execute($stmt);
+       mysqli_stmt_execute($stmt);
 
-       mysqli_bind_result($stmt, $e, $f);
-       mysqli_fetch($stmt);
+       mysqli_stmt_bind_result($stmt, $e, $f);
+       mysqli_stmt_fetch($stmt);
 
-       mysqli_bind_result($stmt, $g, $h);
-       mysqli_fetch($stmt);
+       mysqli_stmt_bind_result($stmt, $g, $h);
+       mysqli_stmt_fetch($stmt);
 
        var_dump((array($e,$f,$g,$h)));
 

diff --git a/ext/mysqli/tests/059.phpt b/ext/mysqli/tests/059.phpt
index 733a3cefba5fde796d572c4d85e38433ad67ef6c..e4b6a0b9fee95ccc91b3333617a0f7c9cb84d334 100644 (file)
--- a/ext/mysqli/tests/059.phpt
+++ b/ext/mysqli/tests/059.phpt
@@ -21,20 +21,20 @@ require_once('skipifconnectfailure.inc');
 
        $stmt = mysqli_prepare($link, "INSERT INTO mbind VALUES (?||?)");
 
-       mysqli_bind_param($stmt, "ss", $a, $b);
+       mysqli_stmt_bind_param($stmt, "ss", $a, $b);
 
        $a = "foo";
        $b = "bar";
 
-       mysqli_execute($stmt);
+       mysqli_stmt_execute($stmt);
 
        mysqli_stmt_close($stmt);
 
        $stmt = mysqli_prepare($link, "SELECT * FROM mbind");
-       mysqli_execute($stmt);
+       mysqli_stmt_execute($stmt);
 
-       mysqli_bind_result($stmt, $e);
-       mysqli_fetch($stmt);
+       mysqli_stmt_bind_result($stmt, $e);
+       mysqli_stmt_fetch($stmt);
 
        var_dump($e);
 

diff --git a/ext/mysqli/tests/065.phpt b/ext/mysqli/tests/065.phpt
index 172cecde3c2c9544ce00ac9c9ff79156872af797..9426644c9d75ad2cf66b0a834bfa981f0575364a 100644 (file)
--- a/ext/mysqli/tests/065.phpt
+++ b/ext/mysqli/tests/065.phpt
@@ -31,7 +31,7 @@ if (version_compare(PHP_VERSION, '5.9.9', '>') == 1) {
                if (3 !== ($tmp = strlen($mysql->real_escape_string($esc_str))))
                        printf("[003] Expecting 3/int got %s/%s\n", gettype($tmp), $tmp);
 
-               if ('latin1' !== ($tmp = $mysql->client_encoding()))
+               if ('latin1' !== ($tmp = $mysql->character_set_name()))
                        printf("[004] Expecting latin1/string got %s/%s\n", gettype($tmp), $tmp);
        }
 
@@ -43,7 +43,7 @@ if (version_compare(PHP_VERSION, '5.9.9', '>') == 1) {
                        if (2 !== ($tmp = strlen($mysql->real_escape_string($esc_str))))
                                        printf("[005] Expecting 2/int got %s/%s\n", gettype($tmp), $tmp);
 
-                       if ('gbk' !== ($tmp = $mysql->client_encoding()))
+                       if ('gbk' !== ($tmp = $mysql->character_set_name()))
                                        printf("[005] Expecting gbk/string got %s/%s\n", gettype($tmp), $tmp);;
                }
        }

diff --git a/ext/mysqli/tests/mysqli_character_set_name.phpt b/ext/mysqli/tests/mysqli_character_set_name.phpt
index 3fa997b50d575e203b186407bdc299413fe5c867..722facab0013e65b6dec9a5d9899090be9695b1a 100644 (file)
--- a/ext/mysqli/tests/mysqli_character_set_name.phpt
+++ b/ext/mysqli/tests/mysqli_character_set_name.phpt
@@ -55,9 +55,9 @@ require_once('skipifconnectfailure.inc');
                }
        }
 
-       $charset2 = mysqli_client_encoding($link);
+       $charset2 = mysqli_character_set_name($link);
        if ($charset2 !== $charset) {
-               printf("[012] Alias mysqli_client_encoding returned %s/%s, expected  %s/%s\n", gettype($charset2), $charset2, gettype($charset), $charset);
+               printf("[012] Alias mysqli_character_set_name returned %s/%s, expected  %s/%s\n", gettype($charset2), $charset2, gettype($charset), $charset);
        }
 
        mysqli_close($link);
@@ -66,7 +66,7 @@ require_once('skipifconnectfailure.inc');
                printf("[013] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
 
        /* Make sure that the function alias exists */
-       if (!is_null($tmp = @mysqli_client_encoding()))
+       if (!is_null($tmp = @mysqli_character_set_name()))
                printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
 
        print "done!";

diff --git a/ext/mysqli/tests/mysqli_character_set_name_oo.phpt b/ext/mysqli/tests/mysqli_character_set_name_oo.phpt
index 43a83bbcb713004de19b4a437279579ec70fc1c1..7b71940e59a7fc1d32b7b5200b0a06f4f6abfce1 100644 (file)
--- a/ext/mysqli/tests/mysqli_character_set_name_oo.phpt
+++ b/ext/mysqli/tests/mysqli_character_set_name_oo.phpt
@@ -51,7 +51,7 @@ mysqli_chararcter_set_name(), mysql_client_encoding() [alias]
 
        $charset2 = $mysqli->character_set_name();
        if ($charset2 !== $charset) {
-               printf("[012] Alias mysqli_client_encoding returned %s/%s, expected  %s/%s\n",
+               printf("[012] Alias mysqli_character_set_name returned %s/%s, expected  %s/%s\n",
                        gettype($charset2), $charset2, gettype($charset), $charset);
        }
 
@@ -61,7 +61,7 @@ mysqli_chararcter_set_name(), mysql_client_encoding() [alias]
                printf("[013] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
 
        /* Make sure that the function alias exists */
-       if (!is_null($tmp = @$mysqli->client_encoding()))
+       if (!is_null($tmp = @$mysqli->character_set_name()))
                printf("[014] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
 
        print "done!";

diff --git a/ext/mysqli/tests/mysqli_get_client_stats_off.phpt b/ext/mysqli/tests/mysqli_get_client_stats_off.phpt
index 884f426c7121ae0da822696e993cdcebc58ad2d0..e2dff9befbafd2c88d83f2ae9f094a38e00a24d9 100644 (file)
--- a/ext/mysqli/tests/mysqli_get_client_stats_off.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats_off.phpt
@@ -15,16 +15,8 @@ mysqlnd.collect_memory_statistics=0
 --FILE--
 <?php
        $before = mysqli_get_client_stats();
-
-       /*
-       NOTE: the function belongs to the mysqnd zval cache. The
-       mysqlnd zval cache was part of PHP from PHP 5.3.0(-dev) to
-       PHP 5.3.0RC3 or something. And it was turned off by default.
-       The function never returned anything meaningful in any released version of PHP.
-
-       */
-       if (!is_array($before)) {
-               printf("[001] Expecting array, got %s.\n", gettype($before));
+       if (!is_array($before) || empty($before)) {
+               printf("[001] Expecting non-empty array, got %s.\n", gettype($before));
                var_dump($before);
        }
 
@@ -39,6 +31,12 @@ mysqlnd.collect_memory_statistics=0
                var_dump($after);
        }
 
+       foreach ($after as $k => $v)
+               if ($v != 0) {
+                       printf("[003] Field %s should not have any other value but 0, got %s.\n",
+                               $k, $v);
+               }
+
        mysqli_close($link);
        print "done!";
 ?>

diff --git a/ext/mysqli/tests/mysqli_prepare.phpt b/ext/mysqli/tests/mysqli_prepare.phpt
index bba82745e7e9f8f3ffcb677b52ddb12f0a9f02c7..d6d6c092b94c560b120fe10e7c838f4f1117b541 100644 (file)
--- a/ext/mysqli/tests/mysqli_prepare.phpt
+++ b/ext/mysqli/tests/mysqli_prepare.phpt
@@ -49,7 +49,7 @@ require_once('skipifconnectfailure.inc');
                printf("[009] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
        $id = 1;
-       if (!mysqli_bind_param($stmt, 'i', $id) || !mysqli_stmt_execute($stmt))
+       if (!mysqli_stmt_bind_param($stmt, 'i', $id) || !mysqli_stmt_execute($stmt))
                printf("[010] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
        mysqli_stmt_close($stmt);
 
@@ -57,7 +57,7 @@ require_once('skipifconnectfailure.inc');
                printf("[011] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
        $id = 2;
-       if (!mysqli_bind_param($stmt, 'i', $id) || !mysqli_stmt_execute($stmt))
+       if (!mysqli_stmt_bind_param($stmt, 'i', $id) || !mysqli_stmt_execute($stmt))
                printf("[012] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
        mysqli_stmt_close($stmt);
 
@@ -66,7 +66,7 @@ require_once('skipifconnectfailure.inc');
 
        $id = 3;
        $where = 2;
-       if (!mysqli_bind_param($stmt, 'ii', $id, $where) || !mysqli_stmt_execute($stmt))
+       if (!mysqli_stmt_bind_param($stmt, 'ii', $id, $where) || !mysqli_stmt_execute($stmt))
                printf("[014] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
        mysqli_stmt_close($stmt);
 
@@ -74,7 +74,7 @@ require_once('skipifconnectfailure.inc');
                printf("[015] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
        $where = 3;
-       if (!mysqli_bind_param($stmt, 'i', $where) || !mysqli_stmt_execute($stmt))
+       if (!mysqli_stmt_bind_param($stmt, 'i', $where) || !mysqli_stmt_execute($stmt))
                printf("[016] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
        mysqli_stmt_close($stmt);
 
@@ -82,7 +82,7 @@ require_once('skipifconnectfailure.inc');
                printf("[017] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
        $testvar = 'testvar';
-       if (!mysqli_bind_param($stmt, 's', $testvar) || !mysqli_stmt_execute($stmt))
+       if (!mysqli_stmt_bind_param($stmt, 's', $testvar) || !mysqli_stmt_execute($stmt))
                printf("[018] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
        mysqli_stmt_close($stmt);
 

diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param.phpt
index 33ef3175ac88578391bf49121a2ff2125dd0147a..71045789bc44afa9ccbf354c32c353eccefb35d5 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_bind_param.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_param.phpt
@@ -379,7 +379,7 @@ require_once('skipifconnectfailure.inc');
 
        /* Check that the function alias exists. It's a deprecated function,
        but we have not announce the removal so far, therefore we need to check for it */
-       if (!is_null($tmp = @mysqli_bind_param()))
+       if (!is_null($tmp = @mysqli_stmt_bind_param()))
                        printf("[021] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
        print "done!";
 ?>

diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result.phpt
index 5b7da34d8df67d5f953421bbe358fc755a56814e..26b39d516f44a8c3da41908e484b60b1e48a0189 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_bind_result.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_result.phpt
@@ -296,7 +296,7 @@ require_once('skipifconnectfailure.inc');
 
        /* Check that the function alias exists. It's a deprecated function,
        but we have not announce the removal so far, therefore we need to check for it */
-       if (!is_null($tmp = @mysqli_bind_result()))
+       if (!is_null($tmp = @mysqli_stmt_bind_result()))
                printf("[3000] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
 
        $stmt = mysqli_stmt_init($link);

diff --git a/ext/mysqli/tests/mysqli_stmt_fetch.phpt b/ext/mysqli/tests/mysqli_stmt_fetch.phpt
index fca510003e9ea15d138bdb4f8746f340e73fbaa9..7598ffeb1b27b64cdb9f6e3f3b0a594277f80ab1 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_fetch.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_fetch.phpt
@@ -80,7 +80,7 @@ require_once('skipifconnectfailure.inc');
 
        /* Check that the function alias exists. It's a deprecated function,
        but we have not announce the removal so far, therefore we need to check for it */
-       if (!is_null($tmp = @mysqli_fetch()))
+       if (!is_null($tmp = @mysqli_stmt_fetch()))
                printf("[017] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
 
        print "done!";

diff --git a/ext/mysqli/tests/mysqli_stmt_param_count.phpt b/ext/mysqli/tests/mysqli_stmt_param_count.phpt
index 84bcfd9e8be840fd14a7ca12292d9548792439f1..3526956898ce2b88aeec28668be5cd9383be8bdc 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_param_count.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_param_count.phpt
@@ -55,7 +55,7 @@ require_once('skipifconnectfailure.inc');
 
        /* Check that the function alias exists. It's a deprecated function,
        but we have not announce the removal so far, therefore we need to check for it */
-       if (!is_null($tmp = @mysqli_param_count()))
+       if (!is_null($tmp = @mysqli_stmt_param_count()))
                printf("[041] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
 
        print "done!";

diff --git a/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt b/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt
index faccdf9e89532c91a4685efe968b9374b1dc6904..f9fd3cf3caf1589287e66de0f3dbe6ca0624f280 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt
@@ -87,7 +87,7 @@ require_once('skipifconnectfailure.inc');
 
        /* Check that the function alias exists. It's a deprecated function,
        but we have not announce the removal so far, therefore we need to check for it */
-       if (!is_null($tmp = @mysqli_get_metadata()))
+       if (!is_null($tmp = @mysqli_stmt_result_metadata()))
                printf("[018] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
 
        mysqli_close($link);

diff --git a/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt b/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt
index 1a6a3d7dbf3ea502f1f368057d15b5befb2c21e3..7e2f8603a870e327b39d2fec1d3e80446c22df50 100644 (file)
--- a/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt
@@ -120,7 +120,7 @@ require_once('skipifconnectfailure.inc');
 
        /* Check that the function alias exists. It's a deprecated function,
        but we have not announce the removal so far, therefore we need to check for it */
-       if (!is_null($tmp = @mysqli_send_long_data()))
+       if (!is_null($tmp = @mysqli_stmt_send_long_data()))
                printf("[023] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
 
        mysqli_close($link);