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

fix merge conflicts

Browse Source
This commit is contained in:
Marc Delisle
2010-07-02 12:32:00 -04:00
parent dbd813095a 43e41e0654
commit 9e857f9f84
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -92,6 +92,7 @@ $Id$
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

2
Documentation.html
View File

@@ -1315,7 +1315,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
<dd>Path for storing session data (<a <dd>Path for storing session data (<a
href="http://php.net/session_save_path">session_save_path PHP parameter</a>).</dd> 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 <dd>Set the number of bytes a script is allowed to allocate. If set
to zero, no limit is imposed.<br /> to zero, no limit is imposed.<br />
This setting is used while importing/exporting dump files and at some This setting is used while importing/exporting dump files and at some

8
libraries/config.default.php
View File

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