diff --git a/ChangeLog b/ChangeLog index c60395a2b..28b94e2f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL$ +2006-12-20 Marc Delisle + * libraries/export/sql.php: bug #1619647, export of query results + should not contain procedure definitions + 2006-12-19 Sebastian Mendel * tbl_change.php, tbl_replace.php, include/tbl_replace_fields.inc.php: refactored: made register_globals independent; added documentation; diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 1fe9514a6..a117b21b0 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -311,7 +311,7 @@ function PMA_exportDBFooter($db) unset($GLOBALS['sql_constraints']); } - if (PMA_MYSQL_INT_VERSION >= 50000) { + if (PMA_MYSQL_INT_VERSION >= 50000 && isset($GLOBALS['sql_structure'])) { $procs_funcs = ''; $procedure_names = PMA_DBI_get_procedures_or_functions($db, 'PROCEDURE');