Update reserved words (from 4.1)

1 files changed, 97 insertions, 88 deletions

diff --git a/Docs/manual.texi b/Docs/manual.texi
index dfdbddcaae7..b846ae1871d 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -28984,7 +28984,7 @@ A few are reserved because MySQL needs them and is
 
 @c START_OF_RESERVED_WORDS
 
-@c Reserved word list updated Tue Jul 23 20:41:20 2002 by monty.
+@c Reserved word list updated Tue Oct  8 13:03:34 2002 by arjen.
 @c To regenerate, use Support/update-reserved-words.pl.
 
 @multitable @columnfractions .33 .33 .34
@@ -29006,38 +29006,41 @@ A few are reserved because MySQL needs them and is
 @item @code{BINARY}
  @tab @code{BLOB}
  @tab @code{BOTH}
-@item @code{BY}
+@item @code{BTREE}
+ @tab @code{BY}
  @tab @code{CASCADE}
- @tab @code{CASE}
-@item @code{CHANGE}
+@item @code{CASE}
+ @tab @code{CHANGE}
  @tab @code{CHAR}
- @tab @code{CHARACTER}
-@item @code{COLUMN}
- @tab @code{COLUMNS}
+@item @code{CHARACTER}
+ @tab @code{COLLATE}
+ @tab @code{COLUMN}
+@item @code{COLUMNS}
  @tab @code{CONSTRAINT}
-@item @code{CREATE}
- @tab @code{CROSS}
+ @tab @code{CREATE}
+@item @code{CROSS}
  @tab @code{CURRENT_DATE}
-@item @code{CURRENT_TIME}
- @tab @code{CURRENT_TIMESTAMP}
+ @tab @code{CURRENT_TIME}
+@item @code{CURRENT_TIMESTAMP}
  @tab @code{DATABASE}
-@item @code{DATABASES}
- @tab @code{DAY_HOUR}
+ @tab @code{DATABASES}
+@item @code{DAY_HOUR}
  @tab @code{DAY_MINUTE}
-@item @code{DAY_SECOND}
- @tab @code{DEC}
+ @tab @code{DAY_SECOND}
+@item @code{DEC}
  @tab @code{DECIMAL}
-@item @code{DEFAULT}
- @tab @code{DELAYED}
+ @tab @code{DEFAULT}
+@item @code{DELAYED}
  @tab @code{DELETE}
-@item @code{DESC}
- @tab @code{DESCRIBE}
+ @tab @code{DESC}
+@item @code{DESCRIBE}
  @tab @code{DISTINCT}
-@item @code{DISTINCTROW}
- @tab @code{DOUBLE}
+ @tab @code{DISTINCTROW}
+@item @code{DOUBLE}
  @tab @code{DROP}
-@item @code{ELSE}
- @tab @code{ENCLOSED}
+ @tab @code{ELSE}
+@item @code{ENCLOSED}
+ @tab @code{ERRORS}
  @tab @code{ESCAPED}
 @item @code{EXISTS}
  @tab @code{EXPLAIN}
@@ -29048,83 +29051,86 @@ A few are reserved because MySQL needs them and is
 @item @code{FROM}
  @tab @code{FULLTEXT}
  @tab @code{FUNCTION}
-@item @code{GRANT}
+@item @code{GEOMETRY}
+ @tab @code{GRANT}
  @tab @code{GROUP}
+@item @code{HASH}
  @tab @code{HAVING}
-@item @code{HIGH_PRIORITY}
- @tab @code{HOUR_MINUTE}
+ @tab @code{HIGH_PRIORITY}
+@item @code{HOUR_MINUTE}
  @tab @code{HOUR_SECOND}
-@item @code{IF}
- @tab @code{IGNORE}
+ @tab @code{IF}
+@item @code{IGNORE}
  @tab @code{IN}
-@item @code{INDEX}
- @tab @code{INFILE}
+ @tab @code{INDEX}
+@item @code{INFILE}
  @tab @code{INNER}
-@item @code{INNODB}
- @tab @code{INSERT}
+ @tab @code{INNODB}
+@item @code{INSERT}
  @tab @code{INT}
-@item @code{INTEGER}
- @tab @code{INTERVAL}
+ @tab @code{INTEGER}
+@item @code{INTERVAL}
  @tab @code{INTO}
-@item @code{IS}
- @tab @code{JOIN}
+ @tab @code{IS}
+@item @code{JOIN}
  @tab @code{KEY}
-@item @code{KEYS}
- @tab @code{KILL}
+ @tab @code{KEYS}
+@item @code{KILL}
  @tab @code{LEADING}
-@item @code{LEFT}
- @tab @code{LIKE}
+ @tab @code{LEFT}
+@item @code{LIKE}
  @tab @code{LIMIT}
-@item @code{LINES}
- @tab @code{LOAD}
+ @tab @code{LINES}
+@item @code{LOAD}
  @tab @code{LOCK}
-@item @code{LONG}
- @tab @code{LONGBLOB}
+ @tab @code{LONG}
+@item @code{LONGBLOB}
  @tab @code{LONGTEXT}
-@item @code{LOW_PRIORITY}
- @tab @code{MASTER_SERVER_ID}
+ @tab @code{LOW_PRIORITY}
+@item @code{MASTER_SERVER_ID}
  @tab @code{MATCH}
-@item @code{MEDIUMBLOB}
- @tab @code{MEDIUMINT}
+ @tab @code{MEDIUMBLOB}
+@item @code{MEDIUMINT}
  @tab @code{MEDIUMTEXT}
-@item @code{MIDDLEINT}
- @tab @code{MINUTE_SECOND}
+ @tab @code{MIDDLEINT}
+@item @code{MINUTE_SECOND}
  @tab @code{MRG_MYISAM}
-@item @code{NATURAL}
- @tab @code{NOT}
+ @tab @code{NATURAL}
+@item @code{NOT}
  @tab @code{NULL}
-@item @code{NUMERIC}
- @tab @code{ON}
+ @tab @code{NUMERIC}
+@item @code{ON}
  @tab @code{OPTIMIZE}
-@item @code{OPTION}
- @tab @code{OPTIONALLY}
+ @tab @code{OPTION}
+@item @code{OPTIONALLY}
  @tab @code{OR}
-@item @code{ORDER}
- @tab @code{OUTER}
+ @tab @code{ORDER}
+@item @code{OUTER}
  @tab @code{OUTFILE}
-@item @code{PARTIAL}
  @tab @code{PRECISION}
- @tab @code{PRIMARY}
-@item @code{PRIVILEGES}
+@item @code{PRIMARY}
+ @tab @code{PRIVILEGES}
  @tab @code{PROCEDURE}
- @tab @code{PURGE}
-@item @code{READ}
+@item @code{PURGE}
+ @tab @code{READ}
  @tab @code{REAL}
- @tab @code{REFERENCES}
-@item @code{REGEXP}
+@item @code{REFERENCES}
+ @tab @code{REGEXP}
  @tab @code{RENAME}
- @tab @code{REPLACE}
-@item @code{REQUIRE}
+@item @code{REPLACE}
+ @tab @code{REQUIRE}
  @tab @code{RESTRICT}
- @tab @code{RETURNS}
-@item @code{REVOKE}
+@item @code{RETURNS}
+ @tab @code{REVOKE}
  @tab @code{RIGHT}
- @tab @code{RLIKE}
-@item @code{SELECT}
- @tab @code{SET}
+@item @code{RLIKE}
+ @tab @code{RTREE}
+ @tab @code{SELECT}
+@item @code{SET}
  @tab @code{SHOW}
-@item @code{SMALLINT}
- @tab @code{SONAME}
+ @tab @code{SMALLINT}
+@item @code{SONAME}
+ @tab @code{SPATIAL}
  @tab @code{SQL_BIG_RESULT}
 @item @code{SQL_CALC_FOUND_ROWS}
  @tab @code{SQL_SMALL_RESULT}
@@ -29141,26 +29147,29 @@ A few are reserved because MySQL needs them and is
 @item @code{TINYTEXT}
  @tab @code{TO}
  @tab @code{TRAILING}
-@item @code{UNION}
+@item @code{TYPES}
+ @tab @code{UNION}
  @tab @code{UNIQUE}
- @tab @code{UNLOCK}
-@item @code{UNSIGNED}
+@item @code{UNLOCK}
+ @tab @code{UNSIGNED}
  @tab @code{UPDATE}
- @tab @code{USAGE}
-@item @code{USE}
+@item @code{USAGE}
+ @tab @code{USE}
  @tab @code{USER_RESOURCES}
- @tab @code{USING}
-@item @code{VALUES}
+@item @code{USING}
+ @tab @code{VALUES}
  @tab @code{VARBINARY}
- @tab @code{VARCHAR}
-@item @code{VARYING}
- @tab @code{WHEN}
+@item @code{VARCHAR}
+ @tab @code{VARYING}
+ @tab @code{WARNINGS}
+@item @code{WHEN}
  @tab @code{WHERE}
-@item @code{WITH}
- @tab @code{WRITE}
+ @tab @code{WITH}
+@item @code{WRITE}
  @tab @code{XOR}
-@item @code{YEAR_MONTH}
- @tab @code{ZEROFILL}
+ @tab @code{YEAR_MONTH}
+@item @code{ZEROFILL}
+ @tab
  @tab
 @end multitable