diff --git a/ChangeLog b/ChangeLog
index 5b432ed3c..5aa395640 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-07-01 Alexander M. Turek  <rabus@users.sourceforge.net>
+    * sql.php3: Completed fix against bug #575867 (Error with limit or load in
+      the table name).
+
 2002-07-01 Olivier L. Müller  <om@omnis.ch>
     * header.inc.php3: nicer CSS for Tabs (J.Fornallaz)
     * tbl_properties.php3: added insert button to Marc's <select> :)
diff --git a/sql.php3 b/sql.php3
index 2ba0d8e0c..733587771 100755
--- a/sql.php3
+++ b/sql.php3
@@ -599,14 +599,14 @@ require('./footer.inc.php3');
 
         foreach ($res_words_arr as $w) {
             // separate a backquoted expression with spaces
-            $pattern = "$w`([^`]*)`(.*)";
-            $replace = "$w `\\1` \\2";
-            $sql_str = eregi_replace($pattern, $replace, $sql_str);
+            $pattern = " $w`([^`]*)`(.*)";
+            $replace = " $w `\\1` \\2";
+            $sql_str = substr(eregi_replace($pattern, $replace, ' ' . $sql_str), 1);
 
             // separate a parenthesized expression with spaces
-            $pattern = $pattern = "$w\(([^)]*)\)(.*)";
-            $replace = "$w (\\1) \\2";
-            $sql_str = eregi_replace($pattern, $replace, $sql_str);
+            $pattern = " $w\(([^)]*)\)(.*)";
+            $replace = " $w (\\1) \\2";
+            $sql_str = substr(eregi_replace($pattern, $replace, ' ' . $sql_str), 1);
 
             // convert reservered words to upper case if not yet done
             $sql_str = substr(eregi_replace(" $w ", " $w ", ' ' . $sql_str), 1);