bk commit into 5.0 tree (kostja:1.2437)

[konstantin]

Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja 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-03-02 15:05:16+03:00, kostja@stripped +1 -0
  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@stripped, 2007-03-02 15:05:13+03:00, kostja@stripped +5 -0
    Freeze the number of conflicts. We should not introduce any more
    conflicts without proper analysis and documentation of the nature of
    the conflict.

# 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:	kostja
# Host:	bodhi.local
# Root:	/opt/local/work/mysql-5.0-runtime

--- 1.507/sql/sql_yacc.yy	2007-03-02 14:29:48 +03:00
+++ 1.508/sql/sql_yacc.yy	2007-03-02 15:05:13 +03:00
@@ -389,6 +389,11 @@
 %}
 
 %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