diff --git a/ChangeLog b/ChangeLog
index 1a8a8bdb9..7ab52834f 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,9 +5,13 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-08-11 Robin Johnson  <robbat2@users.sourceforge.net>
+    * libraries/sqlparser.lib.php3:
+        - Fixed bug #594098
+
 2002-08-12 Marc Delisle  <lem9@users.sourceforge.net>
-    * lang/japanese update, thanks to Yukihiro Kawada
-    * lang/slovenian update, thanks to Kositer Uros (urosh)
+    * lang/japanese update: thanks to Yukihiro Kawada
+    * lang/slovenian update: thanks to Kositer Uros (urosh)
 
 2002-08-12 Mike Beck  <mikebeck@users.sourceforge.net>
     * tbl_select.php3: Bugfix: it created IS 'NULL'
diff --git a/libraries/sqlparser.lib.php3 b/libraries/sqlparser.lib.php3
index 0545d56fb..252991eb2 100644
--- a/libraries/sqlparser.lib.php3
+++ b/libraries/sqlparser.lib.php3
@@ -398,7 +398,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
                 $count2 ++;
                 $is_sql_variable         = ($c == '@');
                 $is_digit                = (!$is_sql_variable) && PMA_STR_isDigit($c);
-                $is_hex_digit            = ($is_digit) && ($c == '0') && ($sql[$count2] == 'x');
+                $is_hex_digit            = ($is_digit) && ($c == '0') && ($count2 < $len) && ($sql[$count2] == 'x');
                 $is_float_digit          = FALSE;
                 $is_float_digit_exponent = FALSE;