diff --git a/ChangeLog b/ChangeLog
index b854148d2..88b4af38b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ $Source$
     * libraries/grab_globals.lib.php: Bug #1153079 (Updating columns starting
       with "str").
     * header.inc.php: Wrong icon for views.
+    * libraries/sqlparser.data.php: Added more missing date / time functions.
 
 2005-03-02 Michal Čihař  <michal@cihar.com>
     * libraries/export/sql.php, libraries/display_export.lib.php: Do not offer
diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php
index 92021d753..b3b0663f7 100644
--- a/libraries/sqlparser.data.php
+++ b/libraries/sqlparser.data.php
@@ -18,6 +18,7 @@ $PMA_SQPdata_function_name = array (
     'ABS',
     'ACOS',
     'ADDDATE',
+    'ADDTIME',
     'AES_ENCRYPT',
     'AES_DECRYPT',
     'ASCII',
@@ -42,6 +43,7 @@ $PMA_SQPdata_function_name = array (
     'CONNECTION_ID',
     'CONV',
     'CONVERT',
+    'CONVERT_TZ',
     'COS',
     'COT',
     'COUNT',
@@ -53,8 +55,10 @@ $PMA_SQPdata_function_name = array (
     'CURTIME',
     'DATABASE',
     'DATE_ADD',
+    'DATE_DIFF',
     'DATE_FORMAT',
     'DATE_SUB',
+    'DAY',
     'DAYNAME',
     'DAYOFMONTH',
     'DAYOFWEEK',
@@ -82,6 +86,7 @@ $PMA_SQPdata_function_name = array (
     'GROUP_CONCAT',
     'GROUP_UNIQUE_USERS',
     'HEX',
+    'HOUR',
     'IFNULL',
     'INET_ATON',
     'INET_NTOA',
@@ -89,6 +94,7 @@ $PMA_SQPdata_function_name = array (
     'INTERVAL',
     'IS_FREE_LOCK',
     'ISNULL',
+    'LAST_DAY',
     'LAST_INSERT_ID',
     'LCASE',
     'LEAST',
@@ -96,6 +102,8 @@ $PMA_SQPdata_function_name = array (
     'LENGTH',
     'LN',
     'LOAD_FILE',
+    'LOCALTIME',
+    'LOCALTIMESTAMP',
     'LOCATE',
     'LOG',
     'LOG2',
@@ -104,11 +112,15 @@ $PMA_SQPdata_function_name = array (
     'LPAD',
     'LTRIM',
     'MAKE_SET',
+    'MAKEDATE',
+    'MAKETIME',
     'MASTER_POS_WAIT',
     'MAX',
     'MD5',
+    'MICROSECOND',
     'MID',
     'MIN',
+    'MINUTE',
     'MOD',
     'MONTH',
     'MONTHNAME',
@@ -137,7 +149,9 @@ $PMA_SQPdata_function_name = array (
     'RPAD',
     'RTRIM',
     'SEC_TO_TIME',
+    'SECOND',
     'SESSION_USER',
+    'STR_TO_DATE',
     'SHA',
     'SHA1',
     'SIGN',
@@ -152,10 +166,16 @@ $PMA_SQPdata_function_name = array (
     'SUBDATE',
     'SUBSTRING',
     'SUBSTRING_INDEX',
+    'SBUTIME',
     'SUM',
     'SYSDATE',
     'SYSTEM_USER',
     'TAN',
+    'TIME',
+    'TIMEDIFF',
+    'TIMESTAMP',
+    'TIMESTAMPADD',
+    'TIMESTAMPDIFF',
     'TIME_FORMAT',
     'TIME_TO_SEC',
     'TO_DAYS',
@@ -163,16 +183,20 @@ $PMA_SQPdata_function_name = array (
     'UCASE',
     'UNIQUE_USERS',
     'UNIX_TIMESTAMP',
+    'UTC_DATE',
+    'UTC_TIME',
+    'UTC_TIMESTAMP',
     'UPPER',
     'USER',
     'VERSION',
     'WEEK',
     'WEEKDAY',
+    'WEEKOFYEAR',
     'YEAR',
     'YEARWEEK'
 );
 //$PMA_SQPdata_function_name_cnt = count($PMA_SQPdata_function_name);
-$PMA_SQPdata_function_name_cnt = 155;
+$PMA_SQPdata_function_name_cnt = 178;
 
 $PMA_SQPdata_column_attrib = array (
     'AUTO_INCREMENT',