From 7e7fe6dabb7c998d259dec0a3c9ba37cd6399482 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 30 Dec 2013 08:14:57 -0500
Subject: [PATCH 1/2] Unused variable

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

diff --git a/export.php b/export.php
index 36639364c2..64431bd569 100644
--- a/export.php
+++ b/export.php
@@ -394,7 +394,6 @@ if (!defined('TESTSUITE')) {
                 $export_plugin->exportRoutines($db);
             }
 
-            $i = 0;
             $views = array();
 
             // $tables contains the choices from the user (via $table_select)

From ecf1801dce941864000a03e092a4e857bb5eea8c Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 30 Dec 2013 08:21:23 -0500
Subject: [PATCH 2/2] Adjust break level as we are no longer in the main do
 loop

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 libraries/export.lib.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/libraries/export.lib.php b/libraries/export.lib.php
index 0d01f6163f..1a75bed68c 100644
--- a/libraries/export.lib.php
+++ b/libraries/export.lib.php
@@ -476,10 +476,10 @@ function PMA_exportServer(
             && strpos(' ' . $tmp_select, '|' . $current_db . '|')
         ) {
             if (! $export_plugin->exportDBHeader($current_db)) {
-                break 2;
+                break 1;
             }
             if (! $export_plugin->exportDBCreate($current_db)) {
-                break 2;
+                break 1;
             }
             if (method_exists($export_plugin, 'exportRoutines')
                 && strpos($whatStrucOrData, 'structure') !== false
@@ -507,7 +507,7 @@ function PMA_exportServer(
                         $is_view ? 'stand_in' : 'create_table', $export_type,
                         $do_relation, $do_comments, $do_mime, $do_dates
                     )) {
-                        break 3;
+                        break 2;
                     }
                 }
                 // if this is a view or a merge table, don't export data
@@ -521,7 +521,7 @@ function PMA_exportServer(
                     if (! $export_plugin->exportData(
                         $current_db, $table, $crlf, $err_url, $local_query
                     )) {
-                        break 3;
+                        break 2;
                     }
                 }
                 // now export the triggers (needs to be done after the data
@@ -534,7 +534,7 @@ function PMA_exportServer(
                         'triggers', $export_type,
                         $do_relation, $do_comments, $do_mime, $do_dates
                     )) {
-                        break 2;
+                        break 1;
                     }
                 }
             }
@@ -548,12 +548,12 @@ function PMA_exportServer(
                         'create_view', $export_type,
                         $do_relation, $do_comments, $do_mime, $do_dates
                     )) {
-                        break 3;
+                        break 2;
                     }
                 }
             }
             if (! $export_plugin->exportDBFooter($current_db)) {
-                break 2;
+                break 1;
             }
         }
     } // end foreach database