Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -90,6 +90,7 @@ phpMyAdmin - ChangeLog
 - issue #12362 prefs_manage.php can leave an orphaned temporary file
 - issue #12619 Unable to export csv when using union select
 - issue #12625 Broken Edit links in query results of JOIN query
+- issue #12634 Drop DB error in import if DB doesn't exist
 
 4.6.4 (2016-08-16)
 - issue        [security] Weaknesses with cookie encryption, see PMASA-2016-29

libraries/plugins/export/ExportSql.php

@@ -237,7 +237,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,

test/classes/plugin/export/ExportSqlTest.php

@@ -587,7 +587,7 @@ class ExportSqlTest extends PMATestCase
         $result = ob_get_clean();
 
         $this->assertContains(
-            "DROP DATABASE `db`;\n",
+            "DROP DATABASE IF EXISTS `db`;\n",
             $result
         );
 
@@ -625,7 +625,7 @@ class ExportSqlTest extends PMATestCase
         $result = ob_get_clean();
 
         $this->assertContains(
-            "DROP DATABASE db;\n",
+            "DROP DATABASE IF EXISTS db;\n",
             $result
         );