From: Ilia Alshanetsky <iliaa@php.net>
Date: Tue, 10 Aug 2004 00:44:26 +0000 (+0000)
Subject: MFH: Fixed bug #29581 (Typo inside php.ini comments for mysql.trace_mode).
X-Git-Tag: php-4.3.9RC1~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca19c39b62413873e39dc46cedd7bb85bc92a9f2;p=php

MFH: Fixed bug #29581 (Typo inside php.ini comments for mysql.trace_mode).
---

diff --git a/NEWS b/NEWS
index dfadf5a217..1e0ae3fc4d 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ PHP 4                                                                      NEWS
 - Updated PCRE to provide better error handling in certain cases. (Andrei)
 - NSAPI: added "bucket" parameter to list of non-php.ini-keys of php4_execute
   for doing performance stats without warnings in server-log. (Uwe Schindler)
+- Fixed bug #29581 (Typo inside php.ini comments for mysql.trace_mode). (Ilia)
 - Fixed bug #29443 (Sanity check for wbmp detection). (Ilia)
 - Fixed bug #29369 (Uploaded files with ' or " in their names get their names
   truncated at those characters). (Ilia)
diff --git a/php.ini-dist b/php.ini-dist
index 257dbaa219..960d8aa9b2 100644
--- a/php.ini-dist
+++ b/php.ini-dist
@@ -674,7 +674,7 @@ mysql.default_password =
 mysql.connect_timeout = 60
 
 ; Trace mode. When trace_mode is active (=On), warnings for table/index scans and
-; SQL-Erros will be displayed.
+; SQL-Errors will be displayed.
 mysql.trace_mode = Off
 
 [mSQL]
diff --git a/php.ini-recommended b/php.ini-recommended
index 846e40c424..a3bc60998a 100644
--- a/php.ini-recommended
+++ b/php.ini-recommended
@@ -689,7 +689,7 @@ mysql.default_password =
 mysql.connect_timeout = 60
 
 ; Trace mode. When trace_mode is active (=On), warnings for table/index scans and
-; SQL-Erros will be displayed.
+; SQL-Errors will be displayed.
 mysql.trace_mode = Off
 
 [mSQL]