Merge branch 'QA_4_0'

phpmyadmin · May 20, 2013 · a51604e · a51604e
2 parents 624e675 + a13b1f4
commit a51604e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -28,6 +28,7 @@ phpMyAdmin - ChangeLog
 - bug #3936 Query profiler chart not loading from SQL Query page
 - bug #3946 Missing CSV import option "Do not abort on INSERT error"
 - bug #3943 Missing Operations>Table options>AUTO_INCREMENT
+- bug Missing CREATE DATABASE statement when exporting at database level
 
 4.0.1.0 (2013-05-14)
 - bug #3879 Import broken for CSV using LOAD DATA

diff --git a/export.php b/export.php
@@ -720,6 +720,9 @@ function PMA_exportOutputHandler($line)
         if (! $export_plugin->exportDBHeader($db)) {
             break;
         }
+        if (! $export_plugin->exportDBCreate($db)) {
+            break;
+        }
 
         if (method_exists($export_plugin, 'exportRoutines')
             && strpos($GLOBALS['sql_structure_or_data'], 'structure') !== false

diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php
@@ -706,7 +706,7 @@ public function exportDBCreate($db)
                 return false;
             }
         }
-        $create_query = 'CREATE DATABASE '
+        $create_query = 'CREATE DATABASE IF NOT EXISTS '
             . (isset($GLOBALS['sql_backquotes'])
             ? PMA_Util::backquoteCompat($db, $compat) : $db);
         $collation = PMA_getDbCollation($db);