summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKalle Sommer Nielsen <kalle@php.net>2010-08-13 10:43:15 +0000
committerKalle Sommer Nielsen <kalle@php.net>2010-08-13 10:43:15 +0000
commite72a69aae69d79bbf47f654eedaee6be580f3ca7 (patch)
tree296e5d3184a4dff355ed145d82cfe03f560c2338
parenta6100682d07441da087dd7442ec5f06b2408b0ae (diff)
downloadphp-git-e72a69aae69d79bbf47f654eedaee6be580f3ca7.tar.gz
Changed mysqli_report() to be per-request specific rather than per-process specific (Fixes #52390)
-rw-r--r--NEWS2
-rw-r--r--ext/mysqli/mysqli.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 0aa5dda492..a189d7019d 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@
?? ??? 2010, PHP 5.3.4
- Changed deprecated ini options on startup from E_WARNING to E_DEPRECATED.
(Kalle)
+
- Fixed bug #52573 (SplFileObject::fscanf Segmentation fault). (Felipe)
- Fixed bug #52546 (pdo_dblib segmentation fault when iterating MONEY values).
(Felipe)
@@ -19,6 +20,7 @@
- Fixed bug #52433 (Call to undefined method mysqli::poll() - must be static).
(Andrey)
- Fixed bug #52413 (MySQLi/libmysql build failure on OS X, FreeBSD). (Andrey)
+- Fixed bug #52390 (mysqli_report() should be per-request setting). (Kalle)
- Fixed bug #52302 (mysqli_fetch_all does not work with MYSQLI_USE_RESULT).
(Andrey)
- Fixed bug #51610 (Using oci_connect causes PHP to take a long time to
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 0a448caf87..f30a929653 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -891,6 +891,7 @@ PHP_RINIT_FUNCTION(mysqli)
#endif
MyG(error_msg) = NULL;
MyG(error_no) = 0;
+ MyG(report_mode) = 0;
return SUCCESS;
}