bk commit - mysqldoc tree (1.734)

[arjen]

Below is the list of changes that have just been committed into a local
mysqldoc repository of arjen. When arjen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.734 03/08/21 16:25:45 arjen@stripped +1 -0
  Added 4.1 syntax for allowing KEY instead of PRIMARY KEY in column key options.

  Docs/manual.texi
    1.692 03/08/21 16:25:42 arjen@stripped +5 -2
    Added 4.1 syntax for allowing KEY instead of PRIMARY KEY in column key options.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	arjen
# Host:	george.bitbike.com
# Root:	/home/arjen/mysqldoc

--- 1.691/Docs/manual.texi	Thu Aug 21 07:01:54 2003
+++ 1.692/Docs/manual.texi	Thu Aug 21 16:25:42 2003
@@ -42237,7 +42237,7 @@
 
 create_definition:
     col_name type [NOT NULL | NULL] [DEFAULT default_value] [AUTO_INCREMENT]
-            [PRIMARY KEY] [COMMENT 'string'] [reference_definition]
+            [[PRIMARY] KEY] [COMMENT 'string'] [reference_definition]
   | PRIMARY KEY (index_col_name,...)
   | KEY [index_name] (index_col_name,...)
   | INDEX [index_name] (index_col_name,...)
@@ -42493,7 +42493,10 @@
 (It is allowed but ignored in earlier versions.)
 
 @item
-@code{KEY} is a synonym for @code{INDEX}.
+@code{KEY} is normally a synonym for @code{INDEX}.
+From version 4.1, the key attribute @code{PRIMARY KEY} may also be
+specified as just @code{KEY}. This was implemented for compatibility
+with other databases.
 
 @item
 In MySQL, a @code{UNIQUE} key can have only distinct values. An