nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #1906983 [export] Reimport of FUNCTION fails

Browse Source
This commit is contained in:
Marc Delisle
2008-04-06 23:22:19 +00:00
parent e66998c37c
commit 87e04a80f5
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -28,6 +28,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- patch #1895796 [lang] Typo in Japanese lang files, - patch #1895796 [lang] Typo in Japanese lang files,
thanks to tyman - acoustype thanks to tyman - acoustype
- bug #1935652 [auth] Access denied (show warning about mcrypt on login page) - bug #1935652 [auth] Access denied (show warning about mcrypt on login page)
- bug #1906983 [export] Reimport of FUNCTION fails
2.11.5.1 (2008-03-29) 2.11.5.1 (2008-03-29)
- bug #1909711 [security] Sensitive data in session files - bug #1909711 [security] Sensitive data in session files

8
libraries/export/sql.php
View File

@@ -60,7 +60,7 @@ if (isset($plugin_list)) {
$drop_clause = 'DROP TABLE'; $drop_clause = 'DROP TABLE';
} }
} elseif (PMA_MYSQL_INT_VERSION >= 50000) { } elseif (PMA_MYSQL_INT_VERSION >= 50000) {
$drop_clause = 'DROP TABLE / DROP VIEW'; $drop_clause = 'DROP TABLE / VIEW / PROCEDURE / FUNCTION';
} else { } else {
$drop_clause = 'DROP TABLE'; $drop_clause = 'DROP TABLE';
} }
@@ -342,6 +342,9 @@ function PMA_exportDBFooter($db)
. PMA_exportComment(); . PMA_exportComment();
foreach($procedure_names as $procedure_name) { foreach($procedure_names as $procedure_name) {
if (! empty($GLOBALS['sql_drop_table'])) {
$procs_funcs .= 'DROP PROCEDURE ' . PMA_backquote($procedure_name) . $delimiter . $crlf;
}
$procs_funcs .= PMA_DBI_get_procedure_or_function_def($db, 'PROCEDURE', $procedure_name) . $delimiter . $crlf . $crlf; $procs_funcs .= PMA_DBI_get_procedure_or_function_def($db, 'PROCEDURE', $procedure_name) . $delimiter . $crlf . $crlf;
} }
} }
@@ -353,6 +356,9 @@ function PMA_exportDBFooter($db)
. PMA_exportComment(); . PMA_exportComment();
foreach($function_names as $function_name) { foreach($function_names as $function_name) {
if (! empty($GLOBALS['sql_drop_table'])) {
$procs_funcs .= 'DROP FUNCTION ' . PMA_backquote($function_name) . $delimiter . $crlf;
}
$procs_funcs .= PMA_DBI_get_procedure_or_function_def($db, 'FUNCTION', $function_name) . $delimiter . $crlf . $crlf; $procs_funcs .= PMA_DBI_get_procedure_or_function_def($db, 'FUNCTION', $function_name) . $delimiter . $crlf . $crlf;
} }
} }