From f696e57cbac395f42a8a25cd865e28bb2430ce81 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Sun, 23 Jan 2005 20:57:36 +0000
Subject: [PATCH] keywords

---
 ChangeLog                    | 13 +++++++------
 libraries/sqlparser.data.php | 11 +++++++++--
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1cf2be463..2560a602c 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-01-23 Alexander M. Turek  <me@derrabus.de>
+    * libraries/sqlparser.data.php: Added some keywords.
+
 2005-01-22 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/bookmark.lib.php: bug #1103289: num_rows and MYSQL_USE_RESULT,
       and fix a typo "boommark"
@@ -12,12 +15,7 @@ $Source$
     * lang/serbian: Updated, thanks to Mihailo Stefanovic (mikis).
 
 2005-01-20 Michael Keck  <mkkeck@users.sourceforge.net>
-    * themes/.../theme_right.css.php: new class for disabled (not available)
-      text / values / messages
-    * libraries/tooltip.js: removed wrong typos (sorry)
-
-2005-01-20 Michael Keck  <mkkeck@users.sourceforge.net>
-    * new js-library: tooltip.js for tooltips (hints)
+    * libraries/tooltip.js: new JS library for tooltips (hints)
     * libraries/common.lib.php: img tag modified for mouseover / mouseout
       (show/hide tooltip)
     * header.inc.php: needed div-container for tooltips
@@ -26,6 +24,9 @@ $Source$
     * querywindow.php / tbl_query_box.php: resizing the querywindow if it
       to small
     * themes/.../layout.inc.php: increased QueryWindowHeight / QueryWindowWidth
+    * themes/.../theme_right.css.php: new class for disabled (not available)
+      text / values / messages
+    * libraries/tooltip.js: removed wrong typos (sorry)
 
 2005-01-20 Alexander M. Turek  <me@derrabus.de>
     * server_engines.php, server_links.inc.php: Use Michael's new icon for
diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php
index 101836645..3e0d17c81 100644
--- a/libraries/sqlparser.data.php
+++ b/libraries/sqlparser.data.php
@@ -181,16 +181,21 @@ $PMA_SQPdata_column_attrib = array (
     'INNOBASE',
     'INNODB',
     'ISAM',
+    'MERGE',
+    'MRG_ISAM',
     'MRG_MYISAM',
     'MYISAM',
     'NATIONAL',
+    'NDB',
+    'NDBCLUSTER',
     'PRECISION',
+    'UNDEFINED',
     'UNSIGNED',
     'VARYING',
     'ZEROFILL'
 );
 //$PMA_SQPdata_column_attrib_cnt = count($PMA_SQPdata_column_attrib);
-$PMA_SQPdata_column_attrib_cnt = 15;
+$PMA_SQPdata_column_attrib_cnt = 20;
 
 $PMA_SQPdata_reserved_word = array (
     'ACTION',
@@ -198,6 +203,7 @@ $PMA_SQPdata_reserved_word = array (
     'AFTER',
     'AGAINST',
     'AGGREGATE',
+    'ALGORITHM',
     'ALL',
     'ALTER',
     'ANALYSE',
@@ -400,6 +406,7 @@ $PMA_SQPdata_reserved_word = array (
     'ROWS',
     'SECOND',
     'SELECT',
+    'SEPARATOR',
     'SERIALIZABLE',
     'SESSION',
     'SHARE',
@@ -465,7 +472,7 @@ $PMA_SQPdata_reserved_word = array (
     'YEAR_MONTH'
 );
 //$PMA_SQPdata_reserved_word_cnt = count($PMA_SQPdata_reserved_word);
-$PMA_SQPdata_reserved_word_cnt = 268;
+$PMA_SQPdata_reserved_word_cnt = 270;
 
 $PMA_SQPdata_column_type = array (
     'BIGINT',