The branch, master has been updated via 9e857f9f84591eedf3be50668356411eb52da0fa (commit) via 43e41e0654c6d85e9311796631fddbf15f568cd3 (commit) via 6ea94679499b0e48f6801d0b06c381556f2712c3 (commit) from dbd813095aafb206659d1da93a30d3531fb4daf7 (commit)

- Log ----------------------------------------------------------------- commit 9e857f9f84591eedf3be50668356411eb52da0fa Merge: dbd813095aafb206659d1da93a30d3531fb4daf7 43e41e0654c6d85e9311796631fddbf15f568cd3 Author: Marc Delisle marc@infomarc.info Date: Fri Jul 2 12:32:00 2010 -0400

fix merge conflicts

-----------------------------------------------------------------------

Summary of changes: ChangeLog | 1 + Documentation.html | 2 +- libraries/config.default.php | 8 +++++--- 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 12e1d24..bf99259 100644 --- a/ChangeLog +++ b/ChangeLog @@ -92,6 +92,7 @@ $Id$ is no progress bar possible - bug [replication] Do not offer information_schema in the list of databases - bug [js] Avoid loading twice a js file +- bug #3024344 [setup] Setup forces numeric MemoryLimit

3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/Documentation.html b/Documentation.html index d414b47..7e945db 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1315,7 +1315,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> <dd>Path for storing session data (<a href="http://php.net/session_save_path">session_save_path PHP parameter</a>).</dd>

- <dt id="cfg_MemoryLimit">$cfg['MemoryLimit'] integer [number of bytes]</dt> + <dt id="cfg_MemoryLimit">$cfg['MemoryLimit'] string [number of bytes]</dt> <dd>Set the number of bytes a script is allowed to allocate. If set to zero, no limit is imposed.<br /> This setting is used while importing/exporting dump files and at some diff --git a/libraries/config.default.php b/libraries/config.default.php index b2a3932..be034c8 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -542,11 +542,13 @@ $cfg['ExecTimeLimit'] = 300; $cfg['SessionSavePath'] = '';

/** - * maximum allocated bytes (0 for no limit) + * maximum allocated bytes ('0' for no limit) + * this is a string because '16M' is a valid value; we must put here + * a string as the default value so that /setup accepts strings * - * @global integer $cfg['MemoryLimit'] + * @global string $cfg['MemoryLimit'] */ -$cfg['MemoryLimit'] = 0; +$cfg['MemoryLimit'] = '0';

/** * mark used tables, make possible to show locked tables (since MySQL 3.23.30)

hooks/post-receive