From 5164ad3cc076039d251227e60aa076a25689ae6c Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Thu, 21 Dec 2006 01:07:01 +0000
Subject: [PATCH] bug #1619647, export of query results should not contain
 procedure definitions

---
 ChangeLog                | 4 ++++
 libraries/export/sql.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d69b52ff3..60dc1d109 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog
 $Id$
 $Source$
 
+2006-12-20 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/export/sql.php: bug #1619647, export of query results
+      should not contain procedure definitions
+
 2006-12-15 Marc Delisle  <lem9@users.sourceforge.net>
     * Documentation.html, libraries/common.lib.php, config.default.php:
       bug #1615313, doc referred to HTTP so enable the code to accept
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index a686640de..a8f26332f 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -284,7 +284,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');