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

unneccesary connection to server

Browse Source
This commit is contained in:
Marc Delisle
2009-10-12 11:57:04 +00:00
parent d7ffee57e1
commit 14645a5035
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server_replication.php
View File

@@ -51,25 +51,13 @@ if (isset($GLOBALS['sr_take_action'])) {
$_SESSION['replication']['m_correct'] = ''; $_SESSION['replication']['m_correct'] = '';
$_SESSION['replication']['sr_action_status'] = 'error'; $_SESSION['replication']['sr_action_status'] = 'error';
$_SESSION['replication']['sr_action_info'] = $strReplicationUnknownError; $_SESSION['replication']['sr_action_info'] = $strReplicationUnknownError;
$url = $sr['hostname'];
if ($sr['port'] != '') {
$url .= ':' . $sr['port'];
}
// Attempt to connect to the new master server // Attempt to connect to the new master server
$check_master = null; $link_to_master = PMA_replication_connect_to_master($sr['username'], $sr['pma_pw'], $sr['hostname'], $sr['port']);
$old_error_reporting = error_reporting(0);
$check_master = @mysql_connect($url, $sr['username'], $sr['pma_pw']);
error_reporting($old_error_reporting);
unset($url);
if (!$check_master) { if (! $link_to_master) {
$_SESSION['replication']['sr_action_status'] = 'error'; $_SESSION['replication']['sr_action_status'] = 'error';
$_SESSION['replication']['sr_action_info'] = sprintf($GLOBALS['strReplicationErrorMasterConnect'], $sr['hostname']); $_SESSION['replication']['sr_action_info'] = sprintf($GLOBALS['strReplicationErrorMasterConnect'], $sr['hostname']);
} else { } else {
$link_to_master = PMA_replication_connect_to_master($sr['username'], $sr['pma_pw'], $sr['hostname'], $sr['port']);
// Read the current master position // Read the current master position
$position = PMA_replication_slave_bin_log_master($link_to_master); $position = PMA_replication_slave_bin_log_master($link_to_master);