summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2004-08-10 00:44:26 +0000
committerIlia Alshanetsky <iliaa@php.net>2004-08-10 00:44:26 +0000
commitca19c39b62413873e39dc46cedd7bb85bc92a9f2 (patch)
treefb0cabff216e97efef1f794142d1e3ef9d196a9b
parent3dd7a7f8b453ef842d8cb455c1f9038a6c6e7015 (diff)
downloadphp-git-ca19c39b62413873e39dc46cedd7bb85bc92a9f2.tar.gz
MFH: Fixed bug #29581 (Typo inside php.ini comments for mysql.trace_mode).
-rw-r--r--NEWS1
-rw-r--r--php.ini-dist2
-rw-r--r--php.ini-recommended2
3 files changed, 3 insertions, 2 deletions
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]