diff options
| author | Herman van Rink <rink@initfour.nl> | 2010-02-09 22:57:06 +0300 |
|---|---|---|
| committer | Herman van Rink <rink@initfour.nl> | 2010-02-09 22:57:06 +0300 |
| commit | a82cc85f04c8988a7c654a9df2798ed9693cb003 (patch) | |
| tree | e5fe326c99389abbe386662f8823a0fa8fe21e73 /server_replication.php | |
| parent | 2ee9ff3e201b0c7182cb3d85d25e057dcde55168 (diff) | |
Code cleanup done during Fosdem2010
Diffstat (limited to 'server_replication.php')
| -rw-r--r-- | server_replication.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server_replication.php b/server_replication.php index afba58d56d..5dd4212a79 100644 --- a/server_replication.php +++ b/server_replication.php @@ -40,7 +40,6 @@ if (! $is_superuser) { /** * Handling control requests */ - if (isset($GLOBALS['sr_take_action'])) { $refresh = false; if (isset($GLOBALS['slave_changemaster'])) { @@ -51,6 +50,7 @@ if (isset($GLOBALS['sr_take_action'])) { $_SESSION['replication']['m_correct'] = ''; $_SESSION['replication']['sr_action_status'] = 'error'; $_SESSION['replication']['sr_action_info'] = $strReplicationUnknownError; + // Attempt to connect to the new master server $link_to_master = PMA_replication_connect_to_master($sr['username'], $sr['pma_pw'], $sr['hostname'], $sr['port']); @@ -97,7 +97,7 @@ if (isset($GLOBALS['sr_take_action'])) { } elseif (isset($GLOBALS['sl_sync'])) { // TODO username, host and port could be read from 'show slave status', - // when asked for a password this might work in more situations the just after changing master (where the master password is stored in session) + // when asked for a password this might work in more situations then just after changing master (where the master password is stored in session) $src_link = PMA_replication_connect_to_master($_SESSION['replication']['m_username'], $_SESSION['replication']['m_password'], $_SESSION['replication']['m_hostname'], $_SESSION['replication']['m_port']); $trg_link = null; // using null to indicate the current PMA server |