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

Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Chanaka Dharmarathna 2014-09-17 00:22:30 +05:30
commit 4c1d1b877f
3 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
db_datadict.php
View File

@ -133,6 +133,7 @@ foreach ($tables as $table) {
}
} else {
$have_rel = false;
$res_rel = array();
} // end if

1
libraries/relation.lib.php
View File

@ -1433,7 +1433,6 @@ function PMA_getRelatives($all_tables, $master)
if ($ignore_internal_relations) {
$emerg = '';
$remaining_tables = array();
}
// Build the 'FROM' clause.

1
libraries/replication_gui.lib.php
View File

@ -198,6 +198,7 @@ function PMA_getHtmlForSlaveConfiguration(
. PMA_URL_getCommon($_url_params);
$_url_params = $GLOBALS['url_params'];
$_url_params['sr_take_action'] = true;
$_url_params['sr_slave_skip_error'] = true;
$slave_skip_error_link = 'server_replication.php'
. PMA_URL_getCommon($_url_params);