From 41b07b20092dadddcd336c0922e448b887184acb Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Fri, 14 Oct 2016 09:54:50 +0530 Subject: [PATCH] Use IF EXISTS with DROP Database to prevent error while importing Fix #12634 Signed-off-by: Deven Bansod --- 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'), 'DROP DATABASE') + sprintf(__('Add %s statement'), 'DROP DATABASE IF EXISTS') ); $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,