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

Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1

Browse Source
This commit is contained in:
Weblate 2013-12-12 02:45:07 +01:00
commit 73c6d64d9d
2 changed files with 73 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
4.1.1.0 (not yet released)
- bug #4154 Error using UNION query
- bug #4173 Transformations overview not reachable
- bug #4149 Js freezes in the management of replication
4.1.0.0 (not yet released)
+ rfe #499 On user creation, warn if the user already exists

89
libraries/replication_gui.lib.php
View File

@ -893,20 +893,55 @@ function PMA_handleControlRequest()
{
if (isset($_REQUEST['sr_take_action'])) {
$refresh = false;
$result = null;
$messageSuccess = null;
$messageError = null;
if (isset($_REQUEST['slave_changemaster'])) {
PMA_handleRequestForSlaveChangeMaster();
$result = PMA_handleRequestForSlaveChangeMaster();
} elseif (isset($_REQUEST['sr_slave_server_control'])) {
PMA_handleRequestForSlaveServerControl();
$result = PMA_handleRequestForSlaveServerControl();
$refresh = true;
switch ($_REQUEST['sr_slave_action']) {
case 'start':
$messageSuccess = __('Replication started successfully.');
$messageError = __('Error starting replication.');
break;
case 'stop':
$messageSuccess = __('Replication stopped successfully.');
$messageError = __('Error stopping replication.');
break;
case 'reset':
$messageSuccess = __('Replication resetting successfully.');
$messageError = __('Error resetting replication.');
break;
default:
$messageSuccess = __('Success.');
$messageError = __('Error.');
break;
}
} elseif (isset($_REQUEST['sr_slave_skip_error'])) {
PMA_handleRequestForSlaveSkipError();
$result = PMA_handleRequestForSlaveSkipError();
}
if ($refresh) {
Header(
"Location: server_replication.php"
. PMA_URL_getCommon($GLOBALS['url_params'])
);
$response = PMA_Response::getInstance();
if ($response->isAjax()) {
$response->isSuccess($result);
$response->addJSON(
'message',
$result ? PMA_Message::success($messageSuccess) : PMA_Message::error($messageError)
);
} else {
PMA_sendHeaderLocation(
$GLOBALS['cfg']['PmaAbsoluteUri'] . 'server_replication.php'
. PMA_URL_getCommon($GLOBALS['url_params'], '&')
);
}
}
unset($refresh);
}
@ -914,7 +949,7 @@ function PMA_handleControlRequest()
/**
* handle control requests for Slave Change Master
*
* @return NULL
* @return boolean
*/
function PMA_handleRequestForSlaveChangeMaster()
{
@ -977,31 +1012,44 @@ function PMA_handleRequestForSlaveChangeMaster()
}
}
}
return $_SESSION['replication']['sr_action_status'] === 'success';
}
/**
* handle control requests for Slave Server Control
*
* @return NULL
* @return boolean
*/
function PMA_handleRequestForSlaveServerControl()
{
if (empty($_REQUEST['sr_slave_control_parm'])) {
$_REQUEST['sr_slave_control_parm'] = null;
}
if ($_REQUEST['sr_slave_action'] == 'reset') {
PMA_Replication_Slave_control("STOP");
$GLOBALS['dbi']->tryQuery("RESET SLAVE;");
PMA_Replication_Slave_control("START");
$qStop = PMA_Replication_Slave_control("STOP");
$qReset = $GLOBALS['dbi']->tryQuery("RESET SLAVE;");
$qStart = PMA_Replication_Slave_control("START");
$result = ($qStop !== false && $qStop !== -1 &&
$qReset !== false && $qReset !== -1 &&
$qStart !== false && $qStart !== -1);
} else {
PMA_Replication_Slave_control(
$qControl = PMA_Replication_Slave_control(
$_REQUEST['sr_slave_action'],
$_REQUEST['sr_slave_control_parm']
);
$result = ($qControl !== false && $qControl !== -1);
}
return $result;
}
/**
* handle control requests for Slave Skip Error
*
* @return NULL
* @return boolean
*/
function PMA_handleRequestForSlaveSkipError()
{
@ -1009,8 +1057,15 @@ function PMA_handleRequestForSlaveSkipError()
if (isset($_REQUEST['sr_skip_errors_count'])) {
$count = $_REQUEST['sr_skip_errors_count'] * 1;
}
PMA_Replication_Slave_control("STOP");
$GLOBALS['dbi']->tryQuery("SET GLOBAL SQL_SLAVE_SKIP_COUNTER = ".$count.";");
PMA_Replication_Slave_control("START");
$qStop = PMA_Replication_Slave_control("STOP");
$qSkip = $GLOBALS['dbi']->tryQuery("SET GLOBAL SQL_SLAVE_SKIP_COUNTER = ".$count.";");
$qStart = PMA_Replication_Slave_control("START");
$result = ($qStop !== false && $qStop !== -1 &&
$qSkip !== false && $qSkip !== -1 &&
$qStart !== false && $qStart !== -1);
return $result;
}
?>