]> granicus.if.org Git - php/commitdiff
test fixes
authorFerenc Kovacs <tyrael@php.net>
Wed, 1 Apr 2015 20:03:19 +0000 (22:03 +0200)
committerFerenc Kovacs <tyrael@php.net>
Wed, 1 Apr 2015 20:07:52 +0000 (22:07 +0200)
ext/mysqli/tests/mysqli_fetch_field_flags.phpt
ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt

index 8259d2f505b580f440632f4daec24eb104d10973..06b936aeed26caa8402eeeef77369372f7071b9a 100644 (file)
@@ -199,7 +199,6 @@ mysqli_close($link);
        if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) {
                printf("[008] %s [%d] %s\n", $column_def,
                        mysqli_errno($link), mysqli_error($link));
-               continue;
        }
 
        $column_def = array('col1 CHAR(1)', 'col2 CHAR(2)','INDEX idx_col1_col2(col1, col2)');
@@ -220,7 +219,6 @@ mysqli_close($link);
                while ($field = mysqli_fetch_field($res)) {
                        if (!isset($expected_flags[$field->name])) {
                                printf("[010] Found unexpected field '%s'\n", $field->name);
-                               continue;
                        }
                        list($missing_flags, $unexpected_flags, $flags_found) = checkFlags($field->flags, $expected_flags[$field->name], $flags);
                        if ($unexpected_flags)
index 5990ab812e3843a649863658309d19e3233493b1..12699c5bf34399fee2996f9d2ab4e4b31c7a3e45 100644 (file)
@@ -85,10 +85,10 @@ MySQLPDOTest::skip();
 
 
        } catch (PDOException $e) {
-               printf("[001] %s, [%s] %s\n",
+               printf("[001] %s, [%s] %s [%s] %s\n",
                        $e->getMessage(),
-                       (is_object($db)) ? $db->errorCode() : 'n/a',
-                       (is_object($db)) ? implode(' ', $db->errorInfo()) : 'n/a');
+                       (is_object($db1)) ? $db1->errorCode() : 'n/a',
+                       (is_object($db2)) ? implode(' ', $db2->errorInfo()) : 'n/a');
        }
 
        print "done!";