diff --git a/ChangeLog b/ChangeLog
index 8e230eff8..bc6f165ad 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-07-01 Alexander M. Turek  <rabus@users.sourceforge.net>
+    * sql.php3: Fixed bug #575867 (Error with limit or load in the table name).
+
 2002-06-30 Marc Delisle  <lem9@users.sourceforge.net>
     * user_details.php3: fix the tooltip
     * 2.3.0-rc2 released
diff --git a/sql.php3 b/sql.php3
index 5dc013335..2ba0d8e0c 100755
--- a/sql.php3
+++ b/sql.php3
@@ -609,7 +609,7 @@ require('./footer.inc.php3');
             $sql_str = eregi_replace($pattern, $replace, $sql_str);
 
             // convert reservered words to upper case if not yet done
-            $sql_str = eregi_replace("$w ", "$w ", $sql_str);
+            $sql_str = substr(eregi_replace(" $w ", " $w ", ' ' . $sql_str), 1);
         }; // end foreach
 
          // remove repeated spaces