bk commit into 5.2 tree (antony:1.2528)

[antony]

Below is the list of changes that have just been committed into a local
5.2 repository of antony. When antony 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@stripped, 2007-05-24 02:11:24-07:00, antony@stripped +1 -0
  change number of shift/reduce conflicts expected

  sql/sql_yacc.yy@stripped, 2007-05-24 02:11:19-07:00, antony@stripped +2 -2
    change number of shift/reduce conflicts expected

# 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:	antony
# Host:	ppcg5.local
# Root:	/Users/antony/SkunkWorks/mysql-5.2-eric+antony.1

--- 1.569/sql/sql_yacc.yy	2007-05-24 02:11:33 -07:00
+++ 1.570/sql/sql_yacc.yy	2007-05-24 02:11:34 -07:00
@@ -491,10 +491,10 @@ bool my_yyoverflow(short **a, YYSTYPE **
 
 %pure_parser					/* We have threads */
 /*
-  Currently there is 286 shift/reduce conflict. We should not introduce
+  Currently there is 287 shift/reduce conflict. We should not introduce
   new conflicts any more.
 */
-%expect 286
+%expect 287
 
 /*
    Comments for TOKENS.