bk commit into 6.0 tree (gluh:1.2595)

[gluh]

Below is the list of changes that have just been committed into a local
6.0 repository of gluh.  When gluh 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-02-29 12:53:30+04:00, gluh@stripped +1 -0
  after merge fix

  sql/sql_yacc.yy@stripped, 2008-02-29 12:53:27+04:00, gluh@stripped +2 -2
    after merge fix

diff -Nrup a/sql/sql_yacc.yy b/sql/sql_yacc.yy
--- a/sql/sql_yacc.yy	2008-02-28 17:03:50 +04:00
+++ b/sql/sql_yacc.yy	2008-02-29 12:53:27 +04:00
@@ -513,11 +513,11 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %pure_parser                                    /* We have threads */
 /*
   Currently there are 177 shift/reduce conflicts.
-  Currently there are 169 shift/reduce conflicts.
+  Currently there are 168 shift/reduce conflicts.
   We should not introduce new conflicts any more.
 */
 %expect 177
-%expect 169
+%expect 168
 
 /*
    Comments for TOKENS.