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

Configurable memory limit (RFE #1373904).

Browse Source
This commit is contained in:
Michal Čihař
2005-12-16 13:57:32 +00:00
parent fc270335cf
commit 8c6b3995d1
5 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -9,6 +9,8 @@ $Source$
* Documentation.html, libraries/common.lib.php, * Documentation.html, libraries/common.lib.php,
libraries/config.default.php, libraries/database_interface.lib.php: Add libraries/config.default.php, libraries/database_interface.lib.php: Add
support for hiding databases (RFE #1372865). support for hiding databases (RFE #1372865).
* Documentation.html, export.php, import.php,
libraries/config.default.php: Configurable memory limit (RFE #1373904).
2005-12-14 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2005-12-14 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* libraries/Config.class.php: * libraries/Config.class.php:

9
Documentation.html
View File

@@ -1003,6 +1003,15 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON &lt;pma_db&gt;.* TO 'pma'@'localhost';
effect when PHP is running in safe mode. effect when PHP is running in safe mode.
</dd> </dd>
<dt><b><a name="cfg_MemoryLimit"></a>$cfg[MemoryLimit] </b>integer [number of bytes]</dt>
<dd>
Set the number of bytes a script is allowed to allocate. If number set
to zero, no limit is imposed.<br />
This setting is used while importing/exporting dump files but has no
effect when PHP is running in safe mode.<br />
You can also use any string as in php.ini, eg. '16M'.
</dd>
<dt><b><a name="cfg_SkipLockedTables"></a>$cfg[SkipLockedTables] </b>boolean</dt> <dt><b><a name="cfg_SkipLockedTables"></a>$cfg[SkipLockedTables] </b>boolean</dt>
<dd> <dd>
Mark used tables and make it possible to show databases with locked Mark used tables and make it possible to show databases with locked

3
export.php
View File

@@ -35,6 +35,9 @@ if ($export_type == 'server') {
* Increase time limit for script execution and initializes some variables * Increase time limit for script execution and initializes some variables
*/ */
@set_time_limit($cfg['ExecTimeLimit']); @set_time_limit($cfg['ExecTimeLimit']);
if (!empty($cfg['MemoryLimit'])) {
@ini_set('memory_limit', $cfg['MemoryLimit']);
}
// Start with empty buffer // Start with empty buffer
$dump_buffer = ''; $dump_buffer = '';

4
import.php
View File

@@ -91,6 +91,10 @@ if (isset($db)) {
} }
@set_time_limit($cfg['ExecTimeLimit']); @set_time_limit($cfg['ExecTimeLimit']);
if (!empty($cfg['MemoryLimit'])) {
@ini_set('memory_limit', $cfg['MemoryLimit']);
}
$timestamp = time(); $timestamp = time();
if (isset($allow_interrupt)) { if (isset($allow_interrupt)) {
$maximum_time = ini_get('max_execution_time'); $maximum_time = ini_get('max_execution_time');

1
libraries/config.default.php
View File

@@ -126,6 +126,7 @@ $cfg['OBGzip'] = 'auto'; // use GZIP output buffering if possib
$cfg['PersistentConnections'] = FALSE; // use persistent connections to MySQL database $cfg['PersistentConnections'] = FALSE; // use persistent connections to MySQL database
$cfg['ForceSSL'] = FALSE; // whether to force using https $cfg['ForceSSL'] = FALSE; // whether to force using https
$cfg['ExecTimeLimit'] = 300; // maximum execution time in seconds (0 for no limit) $cfg['ExecTimeLimit'] = 300; // maximum execution time in seconds (0 for no limit)
$cfg['MemoryLimit'] = 0; // maximum alocated bytes (0 for no limit)
$cfg['SkipLockedTables'] = FALSE; // mark used tables, make possible to show $cfg['SkipLockedTables'] = FALSE; // mark used tables, make possible to show
// locked tables (since MySQL 3.23.30) // locked tables (since MySQL 3.23.30)
$cfg['ShowSQL'] = TRUE; // show SQL queries as run $cfg['ShowSQL'] = TRUE; // show SQL queries as run