The branch, QA_3_3 has been updated via 6ea94679499b0e48f6801d0b06c381556f2712c3 (commit) from 1db012abc83f194b8423eca63a81a6715516dc30 (commit)
- Log ----------------------------------------------------------------- commit 6ea94679499b0e48f6801d0b06c381556f2712c3 Author: Marc Delisle marc@infomarc.info Date: Fri Jul 2 12:26:54 2010 -0400
bug #3024344 [setup] Setup forces numeric MemoryLimit
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 1 + libraries/config.default.php | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog index eaa81ec..7c019b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 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/libraries/config.default.php b/libraries/config.default.php index b1fef17..de03aa2 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -536,11 +536,13 @@ $cfg['ForceSSL'] = false; $cfg['ExecTimeLimit'] = 300;
/** - * 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
-
Marc Delisle