diff --git a/ChangeLog b/ChangeLog
index 1dc6b72da..eb2df71c8 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-08-22 Alexander M. Turek  <rabus@users.sourceforge.net>
+    * libraries/sqlvalidator.lib.php3: Fixed bug #594947.
+
 2002-08-21 Marc Delisle  <lem9@users.sourceforge.net>
     * db_details.php3, read_dump.php3, libraries/functions.js, lang/*,
       config.inc.php3, Documentation.html: web-based upload directory,
diff --git a/libraries/sqlvalidator.lib.php3 b/libraries/sqlvalidator.lib.php3
index 6407bce34..3c9b5e33e 100644
--- a/libraries/sqlvalidator.lib.php3
+++ b/libraries/sqlvalidator.lib.php3
@@ -62,7 +62,9 @@ if (!defined('PMA_SQL_VALIDATOR_INCLUDED')) {
 
         $str = '';
 
-        if ($cfg['SQLValidator']['use'] == TRUE) {
+        if ($cfg['SQLValidator']['use']
+            && !(isset($GLOBALS['sqlvalidator_error'])
+            && $GLOBALS['sqlvalidator_error'])) {
             // create new class instance
             $srv = new PMA_SQLValidator();