From 4ec070cb3133fa0190995bfe59ecfc0b426979bf Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Thu, 18 Jul 2002 21:37:25 +0000
Subject: [PATCH] bug 582356

---
 ChangeLog | 2 ++
 sql.php3  | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c01e24f84f..f7f902a695 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,8 @@ $Source$
     * lang/polish update, thanks to Jakub Wilk
     * lang/galician update, thanks to Xosé Calvo
     * lang/romanian update, thanks to Valics Lehel
+    * sql.php3, bug 582356, Propose table structure was not working when
+      $cfg['ShowAll'] was FALSE
 
 2002-07-18 Steve Alberty  <staybyte@users.sourceforge.net>
     * It is now possible to print stats for more than 2 GB (up to exa byte)
diff --git a/sql.php3 b/sql.php3
index 240b7f70cb..49c19391a5 100755
--- a/sql.php3
+++ b/sql.php3
@@ -297,10 +297,9 @@ else {
     if (isset($pos)
         && (!$cfg['ShowAll'] || $session_max_rows != 'all')
         && $is_select
-        && !($is_count || $is_export || $is_func)
+        && !($is_count || $is_export || $is_func || $is_analyse)
         && eregi('[[:space:]]FROM[[:space:]]', $sql_query)
         && !eregi('[[:space:]]LIMIT[[:space:]0-9,]+$', $sql_query)) {
-
         $sql_limit_to_append = " LIMIT $pos, ".$cfg['MaxRows'];
         if (eregi('(.*)([[:space:]](PROCEDURE[[:space:]](.*)|FOR[[:space:]]+UPDATE|LOCK[[:space:]]+IN[[:space:]]+SHARE[[:space:]]+MODE))$', $sql_query, $regs)) {
             $full_sql_query  = $regs[1] . $sql_limit_to_append . $regs[2];