MFH: Fixed bug #28087 (Do not force mysql.trace_mode to 0 on every request)

diff --git a/NEWS b/NEWS
index 0bef2b3313f736ec12e6a539335d668a33362aa9..54cc74cbb5fd5784b3942d42261a763468f7faba 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@ PHP 4                                                                      NEWS
   Marcus)
 - Fixed bug #28055 (timeout duration too long in feof()/pfsockopen() liveness
   checks). (Wez)
+- Fixed bug #28087 (Do not force mysql.trace_mode to 0 on every request).
+  (Ilia)
 - Fixed bug #28042 (greek letters in html to entitity mapping not correct).
   (Derick)
 - Fixed bug #28007 (compile mssql extension with old versions of FreeTDS

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index 11480d58c621fc1d75d01b5435d13f4312ac9000..ad610e8b30195bff01a619fd1e71865b528498aa 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -425,7 +425,6 @@ PHP_RINIT_FUNCTION(mysql)
        /* Reset connect error/errno on every request */
        MySG(connect_error) = NULL;
        MySG(connect_errno) =0;
-       MySG(trace_mode) = 0;
        MySG(result_allocated) = 0;
        return SUCCESS;
 }