Decrease timeout for running slow queries from 5 seconds to 2 seconds

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index dfe93456ac901dae338222901ea788503254a3e2..896e2ddc9e6d375e6639baef0404c505b1973f91 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -75,7 +75,7 @@ class Adminer {
        * @return float number of seconds
        */
        function queryTimeout() {
-               return 5;
+               return 2;
        }
 
        /** Headers to send before HTML output

diff --git a/changes.txt b/changes.txt
index 43222c1b776dd6bba92308f79bdd3c17fd732ca2..ec4227fcced2e9f7ddc2f8f3034b29d7c388eb9c 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,6 +1,7 @@
 Adminer 4.6.3-dev:
 Stop session before connecting
 Simplify running slow queries
+Decrease timeout for running slow queries from 5 seconds to 2 seconds
 Fix displaying info about non-alphabetical objects (bug #599)
 PDO: Support binary fields download
 MySQL: Use CONVERT() only when searching for non-ASCII (bug #603)