From f7f5f0064999d955f94e7f7b8710e92344fcff13 Mon Sep 17 00:00:00 2001
From: unknown <kostja@bodhi.local>
Date: Fri, 2 Mar 2007 15:05:16 +0300
Subject: [PATCH] Freeze the number of conflicts. We should not introduce any
 more conflicts without proper analysis and documentation of the nature of the
 conflict.

---
 sql/sql_yacc.yy | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index f043d48b186..6b15ccfd729 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -389,6 +389,11 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
 %}
 
 %pure_parser					/* We have threads */
+/*
+  Currently there is 251 shift/reduce conflict. We should not introduce
+  new conflicts any more.
+*/
+%expect 251
 
 %token  END_OF_INPUT