diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php index d1b14e6179..1ef25a1c0f 100644 --- a/libraries/replication.inc.php +++ b/libraries/replication.inc.php @@ -15,6 +15,19 @@ if (! defined('PHPMYADMIN')) { */ $server_master_replication = $GLOBALS['dbi']->fetchResult('SHOW MASTER STATUS'); +/** + * check for multi-master replication functionality + */ +$server_slave_multi_replication = $GLOBALS['dbi']->fetchResult('SHOW ALL SLAVES STATUS'); + +/** + * set slave selected server + */ +if ($server_slave_multi_replication && $_REQUEST['master_connection']) { + $GLOBALS['dbi']->query("SET @@default_master_connection = '" . PMA_Util::sqlAddSlashes($_REQUEST['master_connection']) . "'"); + $GLOBALS['url_params']['master_connection'] = $_REQUEST['master_connection']; +} + /** * get slave replication from server */ diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php index 684521c550..c5bbb2c4d8 100644 --- a/libraries/replication_gui.lib.php +++ b/libraries/replication_gui.lib.php @@ -139,6 +139,21 @@ function PMA_getHtmlForSlaveConfiguration( ) { $html = '