From 2f1812f256f20c03ba4465a788c8b31e250adfc9 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Mon, 29 Dec 2003 17:20:12 +0000
Subject: [PATCH] Added 'COLLATE' and 'RETURN'

---
 ChangeLog                    | 3 +++
 libraries/sqlparser.data.php | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index cace554ba..6bc4db373 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@ $Source$
     * tbl_properties_strcuture, tbl_properties_table_info.php:
       - Changed "Charset" label to "Collation" because it fits better;
       - The column collations weren't displayed with MySQL 5.0.
+    * libraries/sqlparser.data.php: New reserved words:
+      - COLLATE (since MySQL 4.1.0);
+      - RETURN  (since MySQL 5.0.0).
 
 2003-12-28 Marc Delisle  <lem9@users.sourceforge.net>
     ### 2.5.5 released
diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php
index 285848a39..ee43329de 100644
--- a/libraries/sqlparser.data.php
+++ b/libraries/sqlparser.data.php
@@ -220,6 +220,7 @@ $PMA_SQPdata_reserved_word = array (
     'CHECK',
     'CHECKSUM',
     'CLIENT',
+    'COLLATE',
     'COLLATION',
     'COLUMN',
     'COLUMNS',
@@ -381,6 +382,7 @@ $PMA_SQPdata_reserved_word = array (
     'RESET',
     'RESTORE',
     'RESTRICT',
+    'RETURN',
     'RETURNS',
     'REVOKE',
     'RIGHT',
@@ -451,7 +453,7 @@ $PMA_SQPdata_reserved_word = array (
     'YEAR_MONTH'
 );
 //$PMA_SQPdata_reserved_word_cnt = count($PMA_SQPdata_reserved_word);
-$PMA_SQPdata_reserved_word_cnt = 256;
+$PMA_SQPdata_reserved_word_cnt = 258;
 
 $PMA_SQPdata_column_type = array (
     'BIGINT',