1 files changed, 14 insertions, 5 deletions
diff --git a/program/lib/Roundcube/rcube_db_mysql.php b/program/lib/Roundcube/rcube_db_mysql.php
index 0e85b0f9c..067e94be6 100644
--- a/program/lib/Roundcube/rcube_db_mysql.php
+++ b/program/lib/Roundcube/rcube_db_mysql.php
@@ -161,15 +161,24 @@ class rcube_db_mysql extends rcube_db
     {
         if (!isset($this->variables)) {
             $this->variables = array();
+        }
 
-            $result = $this->query('SHOW VARIABLES');
+        if (array_key_exists($varname, $this->variables)) {
+            return $this->variables[$varname];
+        }
 
-            while ($row = $this->fetch_array($result)) {
-                $this->variables[$row[0]] = $row[1];
-            }
+        $result = $this->query('SHOW VARIABLES LIKE ?', $varname);
+
+        while ($row = $this->fetch_array($result)) {
+            $this->variables[$row[0]] = $row[1];
+        }
+
+        // not found, use default
+        if (!isset($this->variables[$varname])) {
+            $this->variables[$varname] = $default;
         }
 
-        return isset($this->variables[$varname]) ? $this->variables[$varname] : $default;
+        return $this->variables[$varname];
     }
 
     /**