diff --git a/ChangeLog b/ChangeLog
index 907ad5a69..7b0b15907 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-09-24 Marc Delisle  <lem9@users.sourceforge.net>
+    * sql.php: following the fix for bug #978930, the added LIMIT was
+      not displayed anymore
+
 2004-09-24 Michal Čihař  <michal@cihar.com>
     * libraries/export/sql.php: Fixed export of '0' string (bug #1033869).
 
diff --git a/sql.php b/sql.php
index 00a4ce90d..0a1e5b707 100644
--- a/sql.php
+++ b/sql.php
@@ -319,12 +319,15 @@ else {
         } else {
             $full_sql_query  = $sql_query . $sql_limit_to_append;
         }
+
         if (isset($display_query)) {
             if (preg_match('@((.|\n)*)(([[:space:]](PROCEDURE[[:space:]](.*)|FOR[[:space:]]+UPDATE|LOCK[[:space:]]+IN[[:space:]]+SHARE[[:space:]]+MODE))|;)[[:space:]]*$@i', $display_query, $regs)) {
                 $display_query  = $regs[1] . $sql_limit_to_append . $regs[3];
             } else {
                 $display_query  = $display_query . $sql_limit_to_append;
             }
+        } else {
+            $display_query = $full_sql_query;
         }
     } else {
         $full_sql_query      = $sql_query;
@@ -494,7 +497,6 @@ else {
                     }
 
                     // run the count query
-//DEBUG echo "trace cq=" . $count_query . "<br/>";
 
                     if (PMA_MYSQL_INT_VERSION < 40000) {
                         if ($cnt_all_result = PMA_DBI_try_query($count_query)) {