nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #3024344 [setup] Setup forces numeric MemoryLimit

Browse Source
This commit is contained in:
Marc Delisle
2010-07-02 12:26:54 -04:00
parent 1db012abc8
commit 6ea9467949
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -12,6 +12,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
is no progress bar possible is no progress bar possible
- bug [replication] Do not offer information_schema in the list of databases - bug [replication] Do not offer information_schema in the list of databases
- bug [js] Avoid loading twice a js file - bug [js] Avoid loading twice a js file
- bug #3024344 [setup] Setup forces numeric MemoryLimit
3.3.4.0 (2010-06-28) 3.3.4.0 (2010-06-28)
- bug #2996161 [import] properly escape import value - bug #2996161 [import] properly escape import value

8
libraries/config.default.php
View File

@@ -536,11 +536,13 @@ $cfg['ForceSSL'] = false;
$cfg['ExecTimeLimit'] = 300; $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) * mark used tables, make possible to show locked tables (since MySQL 3.23.30)