Merge remote-tracking branch 'origin/master'

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;