List:Commits« Previous MessageNext Message »
From:ahristov Date:January 23 2006 10:06am
Subject:bk commit into 5.1 tree (andrey:1.2078)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of andrey. When andrey 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.2078 06/01/23 11:06:12 andrey@lmy004. +2 -0
  Merge

  mysql-test/t/disabled.def
    1.49 06/01/23 11:06:11 andrey@lmy004. +0 -0
    SCCS merged

  sql/sql_yacc.yy
    1.442 06/01/23 11:00:33 andrey@lmy004. +0 -0
    Auto merged

# 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:	andrey
# Host:	lmy004.
# Root:	/work/mysql-5.1-bug16548/RESYNC

--- 1.441/sql/sql_yacc.yy	2006-01-23 09:31:00 +01:00
+++ 1.442/sql/sql_yacc.yy	2006-01-23 11:00:33 +01:00
@@ -1361,9 +1361,9 @@
               lex->et->init_name(YYTHD, $4);
           }
           ON SCHEDULE_SYM ev_schedule_time
-          ev_on_completion
-          ev_status
-          ev_comment
+          opt_ev_on_completion
+          opt_ev_status
+          opt_ev_comment
           DO_SYM ev_sql_stmt
           {
             /*
@@ -1445,7 +1445,7 @@
           }
       ;
     
-ev_status: /* empty */ {$<ulong_num>$= 0;}
+opt_ev_status: /* empty */ {$<ulong_num>$= 0;}
         | ENABLED_SYM
           {
             LEX *lex=Lex;
@@ -1492,8 +1492,12 @@
           }
       ;
 
-ev_on_completion: /* empty */ {$<ulong_num>$= 0;}
-        | ON COMPLETION_SYM PRESERVE_SYM
+opt_ev_on_completion: /* empty */ {$<ulong_num>$= 0;}
+        | ev_on_completion
+      ;
+
+ev_on_completion: 
+          ON COMPLETION_SYM PRESERVE_SYM
           {
             LEX *lex=Lex;
             if (!lex->et_compile_phase)
@@ -1509,7 +1513,7 @@
           }
       ;
 
-ev_comment: /* empty */ {$<ulong_num>$= 0;}
+opt_ev_comment: /* empty */ {$<ulong_num>$= 0;}
         | COMMENT_SYM TEXT_STRING_sys
           {
             LEX *lex= Lex;
@@ -4797,12 +4801,11 @@
             YYTHD->client_capabilities &= ~CLIENT_MULTI_QUERIES;
 	    
           }
-          ev_on_schedule
-          ev_rename_to
-          ev_on_completion
-          ev_status
-          ev_comment
-          ev_opt_sql_stmt
+          ev_alter_on_schedule_completion
+          opt_ev_rename_to
+          opt_ev_status
+          opt_ev_comment
+          opt_ev_sql_stmt
           {
             /*
               $1 - ALTER
@@ -4817,7 +4820,7 @@
               can overwrite it
             */
             if (!($<ulong_num>5 || $<ulong_num>6 || $<ulong_num>7 ||
-                  $<ulong_num>8 || $<ulong_num>9 || $<ulong_num>10))
+                  $<ulong_num>8 || $<ulong_num>9))
             {
 	      yyerror(ER(ER_SYNTAX_ERROR));
               YYABORT;
@@ -4846,15 +4849,13 @@
           }
 	;
 
+ev_alter_on_schedule_completion: /* empty */ { $<ulong_num>$= 0;}
+        | ON SCHEDULE_SYM ev_schedule_time { $<ulong_num>$= 1; }
+        | ev_on_completion { $<ulong_num>$= 1; }
+        | ON SCHEDULE_SYM ev_schedule_time ev_on_completion { $<ulong_num>$= 1; }
+      ;
 
-ev_on_schedule: /* empty */ { $<ulong_num>$= 0;}
-        | ON SCHEDULE_SYM ev_schedule_time
-          {
-            $<ulong_num>$= 1;
-          }
-        ;
-
-ev_rename_to: /* empty */ { $<ulong_num>$= 0;}
+opt_ev_rename_to: /* empty */ { $<ulong_num>$= 0;}
         | RENAME TO_SYM sp_name
           {
             LEX *lex=Lex;
@@ -4864,7 +4865,7 @@
           }
       ;
  
-ev_opt_sql_stmt: /* empty*/ { $<ulong_num>$= 0;}
+opt_ev_sql_stmt: /* empty*/ { $<ulong_num>$= 0;}
         | DO_SYM ev_sql_stmt
           {
             $<ulong_num>$= 1;

--- 1.48/mysql-test/t/disabled.def	2006-01-19 19:32:52 +01:00
+++ 1.49/mysql-test/t/disabled.def	2006-01-23 11:06:11 +01:00
@@ -20,7 +20,6 @@
 ps_7ndb         : dbug assert in RBR mode when executing test suite
 rpl_ddl         : Bug#15963 SBR does not show "Definer" correctly
 partition_03ndb : Bug#16385
-events          : Affects flush test case. A table lock not released somewhere
 ndb_binlog_basic   : Results are not deterministic, Tomas will fix
 rpl_ndb_basic   : Bug#16228
 rpl_sp          : Bug #16456
Thread
bk commit into 5.1 tree (andrey:1.2078)ahristov23 Jan