From ba357a553e3f6486c6358cbeb816a291efb392be Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Sat, 9 Apr 2011 06:49:36 -0700 Subject: [PATCH] Respect original memory limit (bug #3282091) --- adminer/sql.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adminer/sql.inc.php b/adminer/sql.inc.php index 83014769..a900b449 100644 --- a/adminer/sql.inc.php +++ b/adminer/sql.inc.php @@ -30,7 +30,7 @@ if (!$error && $_POST) { } if (is_string($query)) { // get_file() returns error as number, fread() as false if (function_exists('memory_get_usage')) { - @ini_set("memory_limit", 2 * strlen($query) + memory_get_usage() + 8e6); // @ - may be disabled, 2 - substr and trim, 8e6 - other variables + @ini_set("memory_limit", max(ini_get("memory_limit"), 2 * strlen($query) + memory_get_usage() + 8e6)); // @ - may be disabled, 2 - substr and trim, 8e6 - other variables } if ($query != "" && strlen($query) < 1e6) { // don't add big queries $q = $query . (ereg(';$', $query) ? "" : ";"); //! doesn't work with DELIMITER |