diff --git a/ChangeLog b/ChangeLog
index 611336629..818367aba 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-07-16 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/string.lib.php: typo
+    * libraries/sqlparser.data.php: bug #1238222, parsing of ISNULL()
+
 2005-07-14 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/*: removed unused strInvalidRowCount
 
diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php
index 0a2ed79d0..87c31b73a 100644
--- a/libraries/sqlparser.data.php
+++ b/libraries/sqlparser.data.php
@@ -12,6 +12,10 @@
  *
  * It has been extracted from the lex.h file in the MySQL BK tree
  * (around 4.0.2) as well as the MySQL documentation.
+ *
+ * Note: before adding a value in the arrays, ensure that you respect
+ * proper sorting, especially with underscores. And don't forget to
+ * update the _cnt variable at the end of each array.
  */
 
 $PMA_SQPdata_function_name = array (
@@ -92,8 +96,8 @@ $PMA_SQPdata_function_name = array (
     'INET_NTOA',
     'INSTR',
     'INTERVAL',
-    'IS_FREE_LOCK',
     'ISNULL',
+    'IS_FREE_LOCK',
     'LAST_DAY',
     'LAST_INSERT_ID',
     'LCASE',
@@ -196,7 +200,7 @@ $PMA_SQPdata_function_name = array (
     'YEARWEEK'
 );
 //$PMA_SQPdata_function_name_cnt = count($PMA_SQPdata_function_name);
-$PMA_SQPdata_function_name_cnt = 178;
+$PMA_SQPdata_function_name_cnt = 179;
 
 $PMA_SQPdata_column_attrib = array (
     'AUTO_INCREMENT',