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

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

diff --git a/NEWS b/NEWS
index 0aa5dda4927..a189d7019d1 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 0a448caf870..f30a929653d 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;
 }