diff --git a/ChangeLog b/ChangeLog index bc82005e3..2f91478b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -76,6 +76,7 @@ danbarry - bug #2004915 [bookmarks] Saved queries greater than 1000 chars not displayed, thanks to Maik Wiege - mswiege - bug #2037381 [export] Export type "replace" does not work +- bug #2037375 [export] DROP PROCEDURE needs IF EXISTS 2.11.8.0 (2008-07-28) - patch #1987593 [interface] Table list pagination in navi, diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 6ace41ceb..058581ba7 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -347,7 +347,7 @@ function PMA_exportDBFooter($db) foreach($procedure_names as $procedure_name) { if (! empty($GLOBALS['sql_drop_table'])) { - $text .= 'DROP PROCEDURE ' . PMA_backquote($procedure_name) . $delimiter . $crlf; + $text .= 'DROP PROCEDURE IF EXISTS ' . PMA_backquote($procedure_name) . $delimiter . $crlf; } $text .= PMA_DBI_get_definition($db, 'PROCEDURE', $procedure_name) . $delimiter . $crlf . $crlf; } @@ -361,7 +361,7 @@ function PMA_exportDBFooter($db) foreach($function_names as $function_name) { if (! empty($GLOBALS['sql_drop_table'])) { - $text .= 'DROP FUNCTION ' . PMA_backquote($function_name) . $delimiter . $crlf; + $text .= 'DROP FUNCTION IF EXISTS ' . PMA_backquote($function_name) . $delimiter . $crlf; } $text .= PMA_DBI_get_definition($db, 'FUNCTION', $function_name) . $delimiter . $crlf . $crlf; }