From 4fda8872e6af8ed08a50a21f8b37919c1af12866 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Thu, 24 Dec 2009 12:18:31 +0000
Subject: [PATCH] avoid going back to login page on slave configuration

---
 libraries/dbi/mysql.dbi.lib.php  | 2 +-
 libraries/dbi/mysqli.dbi.lib.php | 2 +-
 libraries/replication.inc.php    | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php
index cac41fca1..275458832 100644
--- a/libraries/dbi/mysql.dbi.lib.php
+++ b/libraries/dbi/mysql.dbi.lib.php
@@ -46,7 +46,7 @@ function PMA_DBI_real_connect($server, $user, $password, $client_flags, $persist
  * @param   string  $password       mysql user password
  * @param   boolean $is_controluser
  * @param   array   $server host/port/socket/persistant
- * @param   boolean $auxiliary_connection (if fails, don't go back to login)
+ * @param   boolean $auxiliary_connection (when true, don't go back to login if connection fails)
  * @return  mixed   false on error or a mysqli object on success
  */
 function PMA_DBI_connect($user, $password, $is_controluser = false, $server = null, $auxiliary_connection = false)
diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php
index 7ba6fbc3e..913bce627 100644
--- a/libraries/dbi/mysqli.dbi.lib.php
+++ b/libraries/dbi/mysqli.dbi.lib.php
@@ -61,7 +61,7 @@ if (! defined('MYSQLI_TYPE_BIT')) {
  * @param   string  $password       mysql user password
  * @param   boolean $is_controluser
  * @param   array   $server host/port/socket 
- * @param   boolean $auxiliary_connection (if fails, don't go back to login)
+ * @param   boolean $auxiliary_connection (when true, don't go back to login if connection fails)
  * @return  mixed   false on error or a mysqli object on success
  */
 function PMA_DBI_connect($user, $password, $is_controluser = false, $server = null, $auxiliary_connection = false)
diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php
index aa060586b..1215e9e3b 100644
--- a/libraries/replication.inc.php
+++ b/libraries/replication.inc.php
@@ -200,7 +200,9 @@ function PMA_replication_connect_to_master($user, $password, $host = null, $port
     $server["port"] = $port;
     $server["socket"] = $socket;
 
-    return PMA_DBI_connect($user, $password, false, $server);
+    // 5th parameter set to true means that it's an auxiliary connection 
+    // and we must not go back to login page if it fails
+    return PMA_DBI_connect($user, $password, false, $server, true);
 }
 /**
  * @param $link - mysql link