diff --git a/ChangeLog b/ChangeLog
index 3e3707be2..b068d5014 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@ $Id$
 $Source$
 
 
+2002-11-01 Alexander M. Turek  <rabus@users.sourceforge.net>
+    * libraries/sqlparser.lib.php3: Avoid regex if possible.
+
 2002-10-31 Marc Delisle  <lem9@users.sourceforge.net>
     * db_details_structure.php3, header.inc.php3, new db_datadict.php3,
       lang/*.php3: data dictionary feature, thanks to Ian Davidson
diff --git a/libraries/sqlparser.lib.php3 b/libraries/sqlparser.lib.php3
index 37fa720a2..ed470e1be 100644
--- a/libraries/sqlparser.lib.php3
+++ b/libraries/sqlparser.lib.php3
@@ -231,7 +231,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
             // ANSI style --
             if (($c == '#')
                 || (($count2 + 1 < $len) && ($c == '/') && ($sql[$count2 + 1] == '*'))
-                || (($count2 + 2 < $len) && ($c == '-') && ($sql[$count2 + 1] == '-') && ereg("(\n|[space])", $sql[$count2 + 2]))) {
+                || (($count2 + 2 < $len) && ($c == '-') && ($sql[$count2 + 1] == '-') && (($sql[$count2 + 2] == ' ') || ($sql[$count2 + 2] == "\n")))) {
                 $count2++;
                 $pos  = 0;
                 $type = 'bad';