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

diff --git a/NEWS b/NEWS
index dfadf5a21702e6592bbb130166a16fe7bbd20dd3..1e0ae3fc4de7d96d05c7da357ecd9035acdf4188 100644 (file)
--- 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 257dbaa21941f28cd007d948eb9e097b729101b7..960d8aa9b27aea411fffc97335ff47aadddf79ac 100644 (file)
--- 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 846e40c424de7107ddfbf59dd7fa58dfd77bdaef..a3bc60998a4c7fed0243a61edabee4d9cb698abd 100644 (file)
--- 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]