004.phpt

Ulf Wendel Thu, 01 Sep 2011 06:38:22 -0700

uw                                       Thu, 01 Sep 2011 13:37:49 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=315989


Log:
Fixing tests debug output

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/mysqli/tests/004.phpt
    U   php/php-src/branches/PHP_5_4/ext/mysqli/tests/004.phpt
    U   php/php-src/trunk/ext/mysqli/tests/004.phpt

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/004.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/004.phpt      2011-09-01 
13:28:12 UTC (rev 315988)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/004.phpt      2011-09-01 
13:37:49 UTC (rev 315989)
@@ -15,24 +15,27 @@
        mysqli_select_db($link, $db);

        if (!mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch"))
-               printf("[001] [%d] string\n", mysqli_errno($link), 
mysqli_error($link));
+               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] string\n", mysqli_errno($link), 
mysqli_error($link));
+               printf("[002] [%d] %s\n", mysqli_errno($link), 
mysqli_error($link));

        if (!mysqli_query($link, "INSERT INTO test_bind_fetch VALUES 
('1234567890', 'this is a test0')"))
-               printf("[003] [%d] string\n", mysqli_errno($link), 
mysqli_error($link));
+               printf("[003] [%d] %s\n", mysqli_errno($link), 
mysqli_error($link));

        if (!mysqli_query($link, "INSERT INTO test_bind_fetch VALUES 
('1234567891', 'this is a test1')"))
-               printf("[004] [%d] string\n", mysqli_errno($link), 
mysqli_error($link));
+               printf("[004] [%d] %s\n", mysqli_errno($link), 
mysqli_error($link));

        if (!mysqli_query($link, "INSERT INTO test_bind_fetch VALUES 
('1234567892', 'this is a test2')"))
-               printf("[005] [%d] string\n", mysqli_errno($link), 
mysqli_error($link));
+               printf("[005] [%d] %s\n", mysqli_errno($link), 
mysqli_error($link));

        if (!mysqli_query($link, "INSERT INTO test_bind_fetch VALUES 
('1234567893', 'this is a test3')"))
-               printf("[006] [%d] string\n", mysqli_errno($link), 
mysqli_error($link));
+               printf("[006] [%d] %s\n", mysqli_errno($link), 
mysqli_error($link));

-       $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch ORDER BY 
c1");
+       if (!$stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch ORDER 
BY c1"))
+               printf("[007] [%d] %s\n", mysqli_errno($link), 
mysqli_error($link));
+
+       $c1 = $c2 = NULL;
        mysqli_stmt_bind_result($stmt, $c1, $c2);
        mysqli_stmt_execute($stmt);
        $i = 4;

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/004.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/004.phpt      2011-09-01 
13:28:12 UTC (rev 315988)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/004.phpt      2011-09-01 
13:37:49 UTC (rev 315989)
@@ -15,24 +15,27 @@
        mysqli_select_db($link, $db);

        if (!mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch"))
-               printf("[001] [%d] string\n", mysqli_errno($link), 
mysqli_error($link));
+               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] string\n", mysqli_errno($link), 
mysqli_error($link));
+               printf("[002] [%d] %s\n", mysqli_errno($link), 
mysqli_error($link));

        if (!mysqli_query($link, "INSERT INTO test_bind_fetch VALUES 
('1234567890', 'this is a test0')"))
-               printf("[003] [%d] string\n", mysqli_errno($link), 
mysqli_error($link));
+               printf("[003] [%d] %s\n", mysqli_errno($link), 
mysqli_error($link));

        if (!mysqli_query($link, "INSERT INTO test_bind_fetch VALUES 
('1234567891', 'this is a test1')"))
-               printf("[004] [%d] string\n", mysqli_errno($link), 
mysqli_error($link));
+               printf("[004] [%d] %s\n", mysqli_errno($link), 
mysqli_error($link));

        if (!mysqli_query($link, "INSERT INTO test_bind_fetch VALUES 
('1234567892', 'this is a test2')"))
-               printf("[005] [%d] string\n", mysqli_errno($link), 
mysqli_error($link));
+               printf("[005] [%d] %s\n", mysqli_errno($link), 
mysqli_error($link));

        if (!mysqli_query($link, "INSERT INTO test_bind_fetch VALUES 
('1234567893', 'this is a test3')"))
-               printf("[006] [%d] string\n", mysqli_errno($link), 
mysqli_error($link));
+               printf("[006] [%d] %s\n", mysqli_errno($link), 
mysqli_error($link));

-       $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch ORDER BY 
c1");
+       if (!$stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch ORDER 
BY c1"))
+               printf("[007] [%d] %s\n", mysqli_errno($link), 
mysqli_error($link));
+
+       $c1 = $c2 = NULL;
        mysqli_stmt_bind_result($stmt, $c1, $c2);
        mysqli_stmt_execute($stmt);
        $i = 4;

Modified: php/php-src/trunk/ext/mysqli/tests/004.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/004.phpt 2011-09-01 13:28:12 UTC (rev 
315988)
+++ php/php-src/trunk/ext/mysqli/tests/004.phpt 2011-09-01 13:37:49 UTC (rev 
315989)
@@ -15,24 +15,27 @@
        mysqli_select_db($link, $db);

        if (!mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch"))
-               printf("[001] [%d] string\n", mysqli_errno($link), 
mysqli_error($link));
+               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] string\n", mysqli_errno($link), 
mysqli_error($link));
+               printf("[002] [%d] %s\n", mysqli_errno($link), 
mysqli_error($link));

        if (!mysqli_query($link, "INSERT INTO test_bind_fetch VALUES 
('1234567890', 'this is a test0')"))
-               printf("[003] [%d] string\n", mysqli_errno($link), 
mysqli_error($link));
+               printf("[003] [%d] %s\n", mysqli_errno($link), 
mysqli_error($link));

        if (!mysqli_query($link, "INSERT INTO test_bind_fetch VALUES 
('1234567891', 'this is a test1')"))
-               printf("[004] [%d] string\n", mysqli_errno($link), 
mysqli_error($link));
+               printf("[004] [%d] %s\n", mysqli_errno($link), 
mysqli_error($link));

        if (!mysqli_query($link, "INSERT INTO test_bind_fetch VALUES 
('1234567892', 'this is a test2')"))
-               printf("[005] [%d] string\n", mysqli_errno($link), 
mysqli_error($link));
+               printf("[005] [%d] %s\n", mysqli_errno($link), 
mysqli_error($link));

        if (!mysqli_query($link, "INSERT INTO test_bind_fetch VALUES 
('1234567893', 'this is a test3')"))
-               printf("[006] [%d] string\n", mysqli_errno($link), 
mysqli_error($link));
+               printf("[006] [%d] %s\n", mysqli_errno($link), 
mysqli_error($link));

-       $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch ORDER BY 
c1");
+       if (!$stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch ORDER 
BY c1"))
+               printf("[007] [%d] %s\n", mysqli_errno($link), 
mysqli_error($link));
+
+       $c1 = $c2 = NULL;
        mysqli_stmt_bind_result($stmt, $c1, $c2);
        mysqli_stmt_execute($stmt);
        $i = 4;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/tests/004.phpt branches/PHP_5_4/ext/mysqli/tests/004.phpt trunk/ext/mysqli/tests/004.phpt

Reply via email to