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

Rename PMA_replication_slave_control -> PMA_Replication_Slave_control

Browse Source
This commit is contained in:
Madhura Jayaratne 2013-05-23 23:22:52 +05:30
parent 84db648391
commit 926fee829b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/replication.inc.php
View File

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

10
server_replication.php
View File

@ -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");
}