diff --git a/libraries/replication.inc.php b/libraries/replication.inc.php index 3315df1bd2..348f183de5 100644 --- a/libraries/replication.inc.php +++ b/libraries/replication.inc.php @@ -165,7 +165,7 @@ function PMA_extractDbOrTable($string, $what = 'db') * * @return mixed output of PMA_DBI_tryQuery */ -function PMA_replication_slave_control($action, $control = null, $link = null) +function PMA_Replication_Slave_control($action, $control = null, $link = null) { $action = strtoupper($action); $control = strtoupper($control); @@ -199,7 +199,7 @@ function PMA_replication_slave_change_master($user, $password, $host, $port, $pos, $stop = true, $start = true, $link = null ) { if ($stop) { - PMA_replication_slave_control("STOP", null, $link); + PMA_Replication_Slave_control("STOP", null, $link); } $out = PMA_DBI_tryQuery( @@ -213,7 +213,7 @@ function PMA_replication_slave_change_master($user, $password, $host, $port, ); if ($start) { - PMA_replication_slave_control("START", null, $link); + PMA_Replication_Slave_control("START", null, $link); } return $out; diff --git a/server_replication.php b/server_replication.php index 70e6b4fb18..a114727aa8 100644 --- a/server_replication.php +++ b/server_replication.php @@ -113,11 +113,11 @@ if (isset($GLOBALS['sr_take_action'])) { } } elseif (isset($GLOBALS['sr_slave_server_control'])) { if ($GLOBALS['sr_slave_action'] == 'reset') { - PMA_replication_slave_control("STOP"); + PMA_Replication_Slave_control("STOP"); PMA_DBI_tryQuery("RESET SLAVE;"); - PMA_replication_slave_control("START"); + PMA_Replication_Slave_control("START"); } else { - PMA_replication_slave_control( + PMA_Replication_Slave_control( $GLOBALS['sr_slave_action'], $GLOBALS['sr_slave_control_parm'] ); @@ -129,9 +129,9 @@ if (isset($GLOBALS['sr_take_action'])) { if (isset($GLOBALS['sr_skip_errors_count'])) { $count = $GLOBALS['sr_skip_errors_count'] * 1; } - PMA_replication_slave_control("STOP"); + PMA_Replication_Slave_control("STOP"); PMA_DBI_tryQuery("SET GLOBAL SQL_SLAVE_SKIP_COUNTER = ".$count.";"); - PMA_replication_slave_control("START"); + PMA_Replication_Slave_control("START"); }