From 41b07b20092dadddcd336c0922e448b887184acb Mon Sep 17 00:00:00 2001
From: Deven Bansod <devenbansod.bits@gmail.com>
Date: Fri, 14 Oct 2016 09:54:50 +0530
Subject: [PATCH 1/2] Use IF EXISTS with DROP Database to prevent error while
 importing

Fix #12634

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
---
 libraries/plugins/export/ExportSql.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/plugins/export/ExportSql.php b/libraries/plugins/export/ExportSql.php
index 644e618077..6af3b8b08d 100644
--- a/libraries/plugins/export/ExportSql.php
+++ b/libraries/plugins/export/ExportSql.php
@@ -236,7 +236,7 @@ class ExportSql extends ExportPlugin
                 if ($plugin_param['export_type'] == 'server') {
                     $leaf = new BoolPropertyItem(
                         "drop_database",
-                        sprintf(__('Add %s statement'), '<code>DROP DATABASE</code>')
+                        sprintf(__('Add %s statement'), '<code>DROP DATABASE IF EXISTS</code>')
                     );
                     $subgroup->addProperty($leaf);
                 }
@@ -796,7 +796,7 @@ class ExportSql extends ExportPlugin
         }
         if (isset($GLOBALS['sql_drop_database'])) {
             if (!PMA_exportOutputHandler(
-                'DROP DATABASE '
+                'DROP DATABASE IF EXISTS '
                 . Util::backquoteCompat(
                     $db_alias,
                     $compat,

From 3accab1764561d5a23e58cb36531ad45d2342db3 Mon Sep 17 00:00:00 2001
From: Deven Bansod <devenbansod.bits@gmail.com>
Date: Fri, 14 Oct 2016 09:55:50 +0530
Subject: [PATCH 2/2] Adjust tests

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
---
 test/classes/plugin/export/ExportSqlTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/classes/plugin/export/ExportSqlTest.php b/test/classes/plugin/export/ExportSqlTest.php
index c690da6b4a..8228bb9916 100644
--- a/test/classes/plugin/export/ExportSqlTest.php
+++ b/test/classes/plugin/export/ExportSqlTest.php
@@ -592,7 +592,7 @@ class ExportSqlTest extends PMATestCase
         $result = ob_get_clean();
 
         $this->assertContains(
-            "DROP DATABASE `db`;\n",
+            "DROP DATABASE IF EXISTS `db`;\n",
             $result
         );
 
@@ -630,7 +630,7 @@ class ExportSqlTest extends PMATestCase
         $result = ob_get_clean();
 
         $this->assertContains(
-            "DROP DATABASE db;\n",
+            "DROP DATABASE IF EXISTS db;\n",
             $result
         );