From d052fd0c51cd4dddba72a882cda0a7045514791c Mon Sep 17 00:00:00 2001
From: Igor Prokopenkov <cmyk777@gmail.com>
Date: Mon, 15 Sep 2014 21:34:09 +0300
Subject: [PATCH 1/3] Fix: broken skip slave error functionality

libraries/replication_gui.lib.php:908
function PMA_handleControlRequest()
checks for
if (isset($_REQUEST['sr_take_action']))
libraries/replication_gui.lib.php:202
but sr_take_action variable isn't included in $slave_skip_error_link generation

Signed-off-by: Igor Prokopenkov <cmyk777@gmail.com>
---
 libraries/replication_gui.lib.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php
index a1f47b5174..030d2d023c 100644
--- a/libraries/replication_gui.lib.php
+++ b/libraries/replication_gui.lib.php
@@ -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);

From 64d606ed590b782c6164a0458ab03c594300a490 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Tue, 16 Sep 2014 07:59:18 -0400
Subject: [PATCH 2/3] Fix code execution path warning

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 db_datadict.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db_datadict.php b/db_datadict.php
index 8fa41c8488..1d2ee54ecb 100644
--- a/db_datadict.php
+++ b/db_datadict.php
@@ -133,6 +133,7 @@ foreach ($tables as $table) {
         }
     } else {
         $have_rel = false;
+        $res_rel = array();
     } // end if
 
 

From 25cbe79a53227012ebf6ffcba249362e17fdf93f Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Tue, 16 Sep 2014 08:10:33 -0400
Subject: [PATCH 3/3] Remove dead code

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 libraries/relation.lib.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index 86982a418c..231784b585 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -1433,7 +1433,6 @@ function PMA_getRelatives($all_tables, $master)
 
     if ($ignore_internal_relations) {
         $emerg = '';
-        $remaining_tables = array();
     }
 
     // Build the 'FROM' clause.