From 27cf08a033cad40dbe6a3e67f64e0b50d38e275e Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 23 Oct 2009 09:15:50 +0000 Subject: [PATCH] bug #2883381 [doc] Side effects of MemoryLimit setting --- ChangeLog | 1 + Documentation.html | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c97e98ff5..58d4fe925 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug [structure] "In use" table incorrectly reported as "view" - bug #2879909 [interface] Removed double htmlspecialchars when editing enum column - bug #2868328 [relations] Adding foreign key when table name contains a dot +- bug #2883381 [doc] Side effects of MemoryLimit setting 3.2.2.1 (2009-10-12) - [security] XSS and SQL injection, thanks to Herman van Rink diff --git a/Documentation.html b/Documentation.html index 17e710f1e..364bb7fc9 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1202,11 +1202,13 @@ ALTER TABLE `pma_column_comments` effect when PHP is running in safe mode.
$cfg['MemoryLimit'] integer [number of bytes]
-
Set the number of bytes a script is allowed to allocate. If number set +
Set the number of bytes a script is allowed to allocate. If set to zero, no limit is imposed.
- This setting is used while importing/exporting dump files but has no - effect when PHP is running in safe mode.
- You can also use any string as in php.ini, eg. '16M'.
+ This setting is used while importing/exporting dump files and at some + other places in phpMyAdmin so you definitely don't want to put here + a too low value. It has no effect when PHP is running in safe mode.
+ You can also use any string as in php.ini, eg. '16M'. Ensure + you don't omit the suffix (16 means 16 bytes!)
$cfg['SkipLockedTables'] boolean
Mark used tables and make it possible to show databases with locked