diff --git a/ChangeLog b/ChangeLog
index ca5fd482a..97025e09c 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ $Source$
         - Fix code to work around CSS bug in Mozilla/Konqueror with 'inherit'
           value.
         - Fix strpos on line 168/169 to work with PHP3
+        - Fixed analyze code to remove print_r()
 
 2002-07-25 Marc Delisle  <lem9@users.sourceforge.net>
     * Documentation.html, clarify about mysql extensions
diff --git a/libraries/sqlparser.lib.php3 b/libraries/sqlparser.lib.php3
index 6ae2dc9a4..c83cfa633 100644
--- a/libraries/sqlparser.lib.php3
+++ b/libraries/sqlparser.lib.php3
@@ -381,9 +381,8 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
             $encodedstr = nl2br(chunk_split(base64_encode(gzcompress($debugstr, 9))));
             echo $encodedstr . "\n";
             echo '---END CUT---<br /><br />' . "\n\n";
-            //$decodedstr = str_replace('<br />', '', base64_decode(gzuncompress($encodedstr)));
-            $decodedstr = gzuncompress(base64_decode(str_replace('<br />', '', $encodedstr)));
-            echo $decodedstr . "\n";
+            //$decodedstr = /*gzuncompress(*/base64_decode(str_replace('<br />', '', $encodedstr))/*)*/;
+            //echo $decodedstr . "\n";
             echo '</p>' . "\n";
             flush();
             ob_flush();
@@ -470,7 +469,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
         );
         $supported_query_types_cnt = count($supported_query_types);
 
-        for ($i = 0; $i <= $size; $i++) {
+        for ($i = 0; $i < $size; $i++) {
             // High speed seek for locating the end of the current query
             if ($seek_queryend == TRUE) {
                 if ($arr[$i]['type'] == 'punct_queryend') {
@@ -514,9 +513,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
             $result[] = $subresult;
         }
 
-        echo '<pre>';
-        print_r($result);
-        echo '</pre>';
+        return $result;
     } // end of the "PMA_SQP_analyze()" function