diff --git a/ChangeLog b/ChangeLog
index 430137d46..25ed1597c 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+
+2002-06-22 Robin Johnson  <robbat2@users.sourceforge.net>
+    * sql.php3:
+        - Fix warning and error from mysql_free_result($cna_all_result);
+
 2002-06-21 Olivier L. Müller  <om@omnis.ch>
     * libraries/common.lib.php3, main.php3: be more tolerant with lazy 
       sysadmins or users by letting them having an empty 
@@ -13,7 +18,7 @@ $Source$
 
 2002-06-21 Robin Johnson  <robbat2@users.sourceforge.net>
     * lang/english*: $strSplitWordsWithSpace
-        - 'splitted' changed to 'seperated'	
+        - 'splitted' changed to 'seperated'
     * lang/portuguese.inc.php3 updates, thanks to Lopo Pizarro
     * lang/polish.inc.php3 updates, thanks to Jakub Wilk
     * db_details_links.php3, header.inc.php3,
diff --git a/sql.php3 b/sql.php3
index f09cbce93..d299c530e 100755
--- a/sql.php3
+++ b/sql.php3
@@ -342,9 +342,9 @@ else {
                     $unlim_num_rows = @mysql_num_rows($cnt_all_result);
                 } else {
                     $unlim_num_rows = mysql_result($cnt_all_result, 0, 'count');
+                }
             }
-            mysql_free_result($cna_all_result);
-            }
+            @mysql_free_result($cna_all_result);
         } else {
             $unlim_num_rows     = 0;
         }