bk commit into 5.0 tree (mats:1.1870)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.0 repository of mats. When mats 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://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1870 05/02/22 08:36:10 mats@stripped +1 -0
  Merge mysql.com:/home/bkroot/mysql-5.0
  into mysql.com:/home/bk/b7879-mysql-5.0

  sql/sql_yacc.yy
    1.343 05/02/22 08:36:08 mats@stripped +0 -0
    Auto merged

# 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:	mats
# Host:	romeo.kindahl.net
# Root:	/home/bk/b7879-mysql-5.0/RESYNC

--- 1.342/sql/sql_yacc.yy	2005-02-19 19:15:20 +01:00
+++ 1.343/sql/sql_yacc.yy	2005-02-22 08:36:08 +01:00
@@ -630,7 +630,6 @@
 %token  VARCHAR
 %token  VARIABLES
 %token  VARIANCE_SYM
-%token  VARIANCE_SYM
 %token  VARYING
 %token  VIEW_SYM
 %token  WARNINGS