From d0ee2336e122c8bb7ce03ab3aa9e1d9672b01d83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 26 Mar 2015 13:43:56 +0100 Subject: [PATCH] Close session for executing user SQL queries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows other requests to be performed while executing long SQL query. RFE #1001 Signed-off-by: Michal Čihař --- libraries/sql.lib.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php index f1f1d3e853..b1d43d4ac3 100644 --- a/libraries/sql.lib.php +++ b/libraries/sql.lib.php @@ -1106,6 +1106,9 @@ function PMA_storeTheQueryAsBookmark($db, $bkm_user, $sql_query_for_bookmark, */ function PMA_executeQueryAndStoreResults($full_sql_query) { + // close session in case the query takes too long + session_write_close(); + // Measure query time. $querytime_before = array_sum(explode(' ', microtime())); @@ -1114,6 +1117,9 @@ function PMA_executeQueryAndStoreResults($full_sql_query) ); $querytime_after = array_sum(explode(' ', microtime())); + // reopen session + session_start(); + $GLOBALS['querytime'] = $querytime_after - $querytime_before; return $result;