diff --git a/ChangeLog b/ChangeLog
index 9a72c560d..a147bba86 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-08-06 Marc Delisle  <lem9@users.sourceforge.net>
+    * sql.php3: bug 782925: fix "Showing rows..." message when user has
+      put a LIMIT in the query
+
 2003-08-06 Michal Cihar  <nijel@users.sourceforge.net>
     * libraries/common.lib.php3: Parse better enum fields (bug #784154).
    
diff --git a/sql.php3 b/sql.php3
index 09fa4d0f2..8b710b612 100755
--- a/sql.php3
+++ b/sql.php3
@@ -364,6 +364,9 @@ else {
 
         if (empty($sql_limit_to_append)) {
             $unlim_num_rows         = $num_rows;
+            // if we did not append a limit, set this to get a correct
+            // "Showing rows..." message
+            $GLOBALS['session_max_rows'] = 'all';
         }
         else if ($is_select) {