diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2015-04-01 22:08:29 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2015-04-01 22:08:29 +0200 |
| commit | 0328a60eeccd2cb0b98ea3c0edbf1214f1668b47 (patch) | |
| tree | 9671065b22d4dd21c0d71e964f3857f07304aa13 | |
| parent | 4975019dd7077a83112b3ba1f7b4ddb9969da79b (diff) | |
| parent | faab4301417517c2c83910101a37a9ed53eb57e1 (diff) | |
| download | php-git-0328a60eeccd2cb0b98ea3c0edbf1214f1668b47.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
test fixes
| -rw-r--r-- | ext/mysqli/tests/mysqli_fetch_field_flags.phpt | 2 | ||||
| -rw-r--r-- | ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt index 8259d2f505..06b936aeed 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt @@ -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) diff --git a/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt b/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt index 5990ab812e..12699c5bf3 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt @@ -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!"; |