bk commit into 6.0 tree (mhansson:1.2623) BUG#35020

[mhansson]

Below is the list of changes that have just been committed into a local
6.0 repository of mhansson.  When mhansson 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, 2008-04-04 13:08:25+02:00, mhansson@riffraff.(none) +1 -0
  Bug#35020: Post-merge fix.

  sql/sql_yacc.yy@stripped, 2008-04-04 13:08:23+02:00, mhansson@riffraff.(none) +2 -2
    Bug#35020: Post-merge: Changed number of expected shift/reduce conflicts 173->172

diff -Nrup a/sql/sql_yacc.yy b/sql/sql_yacc.yy
--- a/sql/sql_yacc.yy	2008-04-04 11:48:07 +02:00
+++ b/sql/sql_yacc.yy	2008-04-04 13:08:23 +02:00
@@ -590,10 +590,10 @@ bool my_yyoverflow(short **a, YYSTYPE **
 
 %pure_parser                                    /* We have threads */
 /*
-  Currently there are 173 shift/reduce conflicts.
+  Currently there are 172 shift/reduce conflicts.
   We should not introduce new conflicts any more.
 */
-%expect 173
+%expect 172
 
 /*
    Comments for TOKENS.