bk commit into 5.0 tree (pem:1.1905)

[pem]

Below is the list of changes that have just been committed into a local
5.0 repository of pem. When pem 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.1905 05/07/11 19:10:51 pem@stripped +1 -0
  Post-review fix.

  sql/sql_yacc.yy
    1.404 05/07/11 19:10:45 pem@stripped +3 -1
    Added explanation to comment.

# 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:	pem
# Host:	mysql.comhem.se
# Root:	/home/pem/work/mysql-5.0

--- 1.403/sql/sql_yacc.yy	2005-07-11 12:46:33 +02:00
+++ 1.404/sql/sql_yacc.yy	2005-07-11 19:10:45 +02:00
@@ -7388,7 +7388,9 @@
 
 /*
  * Keywords that we allow for labels in SPs.
- * Anything that's the beginning of a statement must be in keyword above.
+ * Anything that's the beginning of a statement or characteristics
+ * must be in keyword above, otherwise we get (harmful) shift/reduce
+ * conflicts.
  */
 keyword_sp:
 	ACTION			{}