From f2e2499116e29f7c15b15aa386a00292f1f4e497 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 9 Aug 2008 13:58:44 +0000 Subject: [PATCH] bug #2037375 [export] DROP PROCEDURE needs IF EXISTS --- ChangeLog | 1 + libraries/export/sql.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 569615edb2..bdb51392b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - 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 278183cdc6..2b36ca94a8 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -346,7 +346,7 @@ function PMA_exportDBFooter($db) foreach($procedure_names as $procedure_name) { if (! empty($GLOBALS['sql_drop_table'])) { - $procs_funcs .= 'DROP PROCEDURE ' . PMA_backquote($procedure_name) . $delimiter . $crlf; + $procs_funcs .= 'DROP PROCEDURE IF EXISTS ' . PMA_backquote($procedure_name) . $delimiter . $crlf; } $procs_funcs .= PMA_DBI_get_procedure_or_function_def($db, 'PROCEDURE', $procedure_name) . $delimiter . $crlf . $crlf; } @@ -360,7 +360,7 @@ function PMA_exportDBFooter($db) foreach($function_names as $function_name) { if (! empty($GLOBALS['sql_drop_table'])) { - $procs_funcs .= 'DROP FUNCTION ' . PMA_backquote($function_name) . $delimiter . $crlf; + $procs_funcs .= 'DROP FUNCTION IF EXISTS ' . PMA_backquote($function_name) . $delimiter . $crlf; } $procs_funcs .= PMA_DBI_get_procedure_or_function_def($db, 'FUNCTION', $function_name) . $delimiter . $crlf . $crlf; } -- 2.11.4.GIT