bk commit into 5.1 tree (anozdrin:1.2552) BUG#31947

[Alexander Nozdrin]

Below is the list of changes that have just been committed into a local
5.1 repository of anozdrin.  When anozdrin 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:21:19+03:00, anozdrin@quad. +1 -0
  Fix for Bug#31947: Declare with a reserved word succeeded.
  
  READ_ONLY token was accidentally placed into wrong place
  ('ident' rule). The proper place is in the 'keyword_sp' rule.
  
  The manual should be re-generated after this patch, because
  the manual depends on the 'keyword_sp' rule.

  sql/sql_yacc.yy@stripped, 2008-02-29 12:21:18+03:00, anozdrin@quad. +1 -6
    Move READ_ONLY token to the 'keyword_sp' rule.

diff -Nrup a/sql/sql_yacc.yy b/sql/sql_yacc.yy
--- a/sql/sql_yacc.yy	2008-02-29 02:22:48 +03:00
+++ b/sql/sql_yacc.yy	2008-02-29 12:21:18 +03:00
@@ -10312,12 +10312,6 @@ TEXT_STRING_filesystem:
 
 ident:
           IDENT_sys    { $$=$1; }
-        | READ_ONLY_SYM
-          {
-            THD *thd= YYTHD;
-            $$.str= thd->strmake("read_only",9);
-            $$.length= 9;
-          }
         | keyword
           {
             THD *thd= YYTHD;
@@ -10622,6 +10616,7 @@ keyword_sp:
         | QUARTER_SYM              {}
         | QUERY_SYM                {}
         | QUICK                    {}
+        | READ_ONLY_SYM            {}
         | REBUILD_SYM              {}
         | RECOVER_SYM              {}
         | REDO_BUFFER_SIZE_SYM     {}