From 80afe42f193be68a530c0eaad990c93d8d54ff03 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Sun, 15 Sep 2013 13:15:28 +0530
Subject: [PATCH 1/2] Remove trailing white spaces

---
 libraries/database_interface.lib.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 7a1133dac6..535153cf07 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -1540,8 +1540,8 @@ function PMA_DBI_postConnect($link, $is_controluser = false)
             );
             // Detect Drizzle - it does not support character sets
             $charset_result = PMA_DBI_get_variable(
-                'character_set_results', 
-                PMA_DBI_GETVAR_GLOBAL, 
+                'character_set_results',
+                PMA_DBI_GETVAR_GLOBAL,
                 $link
             );
             if ($charset_result) {
@@ -2134,25 +2134,25 @@ function PMA_is_system_schema($schema_name, $test_for_mysql_schema = false)
  */
 function PMA_getFirstOccurringRegularExpression($regex_array, $query)
 {
-    
+
     $minimum_first_occurence_index = null;
     $regex = null;
-    
+
     for ($i = 0; $i < count($regex_array); $i++) {
         if (preg_match($regex_array[$i], $query, $matches, PREG_OFFSET_CAPTURE)) {
-            
+
             if (is_null($minimum_first_occurence_index)
                 || ($matches[0][1] < $minimum_first_occurence_index)
             ) {
                 $regex = $regex_array[$i];
                 $minimum_first_occurence_index = $matches[0][1];
             }
-            
+
         }
     }
-    
+
     return $regex;
-    
+
 }
 
 ?>

From 5111eb7eb54c54f49b543ac0fb5310ee55b59a50 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Sun, 15 Sep 2013 13:16:00 +0530
Subject: [PATCH 2/2] bug #4088 MySQL server version at index.php incorrect w/
 controlhost

---
 ChangeLog                            | 1 +
 libraries/database_interface.lib.php | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 91d300202b..368729fa27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog
 - bug #4091 Insert ignore option does not work
 - bug #4090 Downloading BLOB downloads page template
 - bug #4092 Clicking on table name in view of information_schema redirects to wrong page
+- bug #4088 MySQL server version at index.php incorrect w/ controlhost
 
 4.0.6.0 (2013-09-05)
 - bug #4036 Call to undefined function mb_detect_encoding (clarify the doc)
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 535153cf07..7e17fcd546 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -1472,6 +1472,9 @@ function PMA_DBI_get_variable($var, $type = PMA_DBI_GETVAR_SESSION, $link = null
  */
 function PMA_DBI_postConnect($link, $is_controluser = false)
 {
+    if ($is_controluser) {
+        return;
+    }
     if (! defined('PMA_MYSQL_INT_VERSION')) {
         if (PMA_Util::cacheExists('PMA_MYSQL_INT_VERSION', true)) {
             define(