bk commit into 5.0 tree (serg:1.1995)

[serg]

Below is the list of changes that have just been committed into a local
5.0 repository of serg. When serg 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
  1.1995 05/08/19 18:00:16 serg@stripped +1 -0
  the syntax is XA END xid [SUSPEND [FOR MIGRATE]]

  sql/sql_yacc.yy
    1.413 05/08/19 18:00:09 serg@stripped +7 -2
    the syntax is XA END xid [SUSPEND [FOR MIGRATE]]

# 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:	serg
# Host:	sergbook.mysql.com
# Root:	/usr/home/serg/Abk/mysql-5.0

--- 1.412/sql/sql_yacc.yy	Fri Aug 12 19:04:49 2005
+++ 1.413/sql/sql_yacc.yy	Fri Aug 19 18:00:09 2005
@@ -8833,7 +8833,7 @@
       {
         Lex->sql_command = SQLCOM_XA_START;
       }
-    | XA_SYM END xid opt_suspend_or_migrate
+    | XA_SYM END xid opt_suspend
       {
         Lex->sql_command = SQLCOM_XA_END;
       }
@@ -8893,9 +8893,14 @@
     | ONE_SYM PHASE_SYM     { Lex->xa_opt=XA_ONE_PHASE;   }
     ;
 
-opt_suspend_or_migrate:
+opt_suspend:
     /* nothing */           { Lex->xa_opt=XA_NONE;        }
     | SUSPEND_SYM           { Lex->xa_opt=XA_SUSPEND;     }
+      opt_migrate
+    ;
+
+opt_migrate:
+    /* nothing */           { }
     | FOR_SYM MIGRATE_SYM   { Lex->xa_opt=XA_FOR_MIGRATE; }
     ;