nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid going back to login page on slave configuration

Browse Source
This commit is contained in:
Marc Delisle
2009-12-24 12:18:31 +00:00
parent c2e242fa40
commit 4fda8872e6
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/dbi/mysql.dbi.lib.php
View File

@@ -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)

2
libraries/dbi/mysqli.dbi.lib.php
View File

@@ -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)

4
libraries/replication.inc.php
View File

@@ -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