From c7b77b9179f1fcb52ed5f4d6b648daa54eeda7b4 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Fri, 20 Feb 2015 04:33:34 -0500 Subject: Fix performance of rcube_db_mysql::get_variable() As currently we're using this to find only max_allowed_packet value, it is better to use "SHOW VARIABLES LIKE ?" instead of asking for all variables. --- program/lib/Roundcube/rcube_db_mysql.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'program/lib/Roundcube') 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]; } /** -- cgit v1.2.3