Fix merge mistake.

4a8e68fb · Alexander Nozdrin · f26ac4ba · 4a8e68fb
Commit 4a8e68fb authored Dec 02, 2009 by Alexander Nozdrin
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/sql_yacc.yy sql/sql_yacc.yy +2 -2

No files found.
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -603,10 +603,10 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
 %pure_parser                                    /* We have threads */
 /*
-  Currently there are 168 shift/reduce conflicts.
+  Currently there are 173 shift/reduce conflicts.
  We should not introduce new conflicts any more.
 */
-%expect 168
+%expect 173
 /*
   Comments for TOKENS.