From a954bcae9e81f2a58e366556f76988c6b56d38c5 Mon Sep 17 00:00:00 2001
From: Kalle Sommer Nielsen <kalle@php.net>
Date: Fri, 13 Aug 2010 10:43:15 +0000
Subject: Changed mysqli_report() to be per-request specific rather than
 per-process specific (Fixes #52390)

---
 NEWS                | 4 ++--
 ext/mysqli/mysqli.c | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 5744e4ba38..ca2d1e85ed 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,9 @@
-PHP                                                                        NEWS
+PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2010, PHP 5.2.15
-
 - Fixed bug #52436 (Compile error if systems do not have stdint.h)
   (Sriram Natarajan)
+- Fixed bug #52390 (mysqli_report() should be per-request setting). (Kalle)
 
 22 Jul 2010, PHP 5.2.14
 - Reverted bug fix #49521 (PDO fetchObject sets values before calling
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 008b97f7a0..c50b30fd1a 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -695,6 +695,7 @@ PHP_RINIT_FUNCTION(mysqli)
 #endif
 	MyG(error_msg) = NULL;
 	MyG(error_no) = 0;
+	MyG(report_mode) = 0;
 
 	return SUCCESS;
 }
-- 
cgit v1.2.1