From 87cc7caa1021368d5ba7b17648679dbfe215c17c Mon Sep 17 00:00:00 2001 From: Lior Kaplan Date: Wed, 1 Apr 2015 18:19:09 +0300 Subject: [PATCH 1/4] Fix typo: unitialized -> uninitialized --- Zend/tests/bug43201.phpt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zend/tests/bug43201.phpt b/Zend/tests/bug43201.phpt index 89e1b667276..53bb5ba98d8 100644 --- a/Zend/tests/bug43201.phpt +++ b/Zend/tests/bug43201.phpt @@ -1,5 +1,5 @@ --TEST-- -Bug #43201 (Crash on using unitialized vals and __get/__set) +Bug #43201 (Crash on using uninitialized vals and __get/__set) --FILE-- Date: Wed, 1 Apr 2015 22:03:19 +0200 Subject: [PATCH 2/4] test fixes --- ext/mysqli/tests/mysqli_fetch_field_flags.phpt | 2 -- 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 8259d2f505b..06b936aeed2 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 5990ab812e3..12699c5bf34 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!"; From 7c1a1189beef34dfebc1ecefc99b2c1db3793105 Mon Sep 17 00:00:00 2001 From: Ferenc Kovacs Date: Wed, 1 Apr 2015 23:06:04 +0200 Subject: [PATCH 3/4] oop, put both the error number and message for both db object to the error message --- ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt b/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt index 12699c5bf34..7972df313df 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt @@ -88,6 +88,8 @@ MySQLPDOTest::skip(); printf("[001] %s, [%s] %s [%s] %s\n", $e->getMessage(), (is_object($db1)) ? $db1->errorCode() : 'n/a', + (is_object($db1)) ? implode(' ', $db1->errorInfo()) : 'n/a'); + (is_object($db2)) ? $db2->errorCode() : 'n/a', (is_object($db2)) ? implode(' ', $db2->errorInfo()) : 'n/a'); } From 9991b8ecee3d8864abe6c05cec12278db1573767 Mon Sep 17 00:00:00 2001 From: Ferenc Kovacs Date: Thu, 2 Apr 2015 00:07:00 +0200 Subject: [PATCH 4/4] sigh, can't even copypaste without screwing up --- ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt b/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt index 7972df313df..d59c9303284 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt @@ -88,7 +88,7 @@ MySQLPDOTest::skip(); printf("[001] %s, [%s] %s [%s] %s\n", $e->getMessage(), (is_object($db1)) ? $db1->errorCode() : 'n/a', - (is_object($db1)) ? implode(' ', $db1->errorInfo()) : 'n/a'); + (is_object($db1)) ? implode(' ', $db1->errorInfo()) : 'n/a', (is_object($db2)) ? $db2->errorCode() : 'n/a', (is_object($db2)) ? implode(' ', $db2->errorInfo()) : 'n/a'); }