List:Commits« Previous MessageNext Message »
From:ahristov Date:January 24 2006 3:05pm
Subject:bk commit into 5.1 tree (andrey:1.2072) BUG#16404
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.2072 06/01/24 16:04:35 andrey@lmy004. +4 -0
  fix for bug#16404 (Events: keyword is ENABLED rather than ENABLE)
  WL#1034 (Internal CRON)

  sql/sql_yacc.yy
    1.444 06/01/24 16:04:20 andrey@lmy004. +3 -7
    ENABLED -> ENABLE
    DISABLED -> DISABLE
    fix for bug#16404 (Events: keyword is ENABLED rather than ENABLE)

  sql/lex.h
    1.153 06/01/24 16:04:20 andrey@lmy004. +0 -2
    enabled/disabled were only for events, going back to enable/disable
    fix for bug#16404

  mysql-test/t/events.test
    1.8 06/01/24 16:04:20 andrey@lmy004. +3 -2
    change test for the fix of bug#16404

  mysql-test/r/events.result
    1.7 06/01/24 16:04:19 andrey@lmy004. +3 -2
    fix results file

# 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-bug16404

--- 1.152/sql/lex.h	2006-01-17 08:37:25 +01:00
+++ 1.153/sql/lex.h	2006-01-24 16:04:20 +01:00
@@ -168,7 +168,6 @@
   { "DETERMINISTIC",    SYM(DETERMINISTIC_SYM)},
   { "DIRECTORY",	SYM(DIRECTORY_SYM)},
   { "DISABLE",		SYM(DISABLE_SYM)},
-  { "DISABLED",		SYM(DISABLED_SYM)},
   { "DISCARD",		SYM(DISCARD)},
   { "DISK",		SYM(DISK_SYM)},
   { "DISTINCT",		SYM(DISTINCT)},
@@ -185,7 +184,6 @@
   { "ELSE",             SYM(ELSE)},
   { "ELSEIF",           SYM(ELSEIF_SYM)},
   { "ENABLE",		SYM(ENABLE_SYM)},
-  { "ENABLED",		SYM(ENABLED_SYM)},
   { "ENCLOSED",		SYM(ENCLOSED)},
   { "END",		SYM(END)},
   { "ENDS",		SYM(ENDS_SYM)},

--- 1.443/sql/sql_yacc.yy	2006-01-23 16:13:38 +01:00
+++ 1.444/sql/sql_yacc.yy	2006-01-24 16:04:20 +01:00
@@ -243,7 +243,6 @@
 %token  DETERMINISTIC_SYM
 %token  DIRECTORY_SYM
 %token  DISABLE_SYM
-%token  DISABLED_SYM
 %token  DISCARD
 %token  DISK_SYM
 %token  DISTINCT
@@ -259,7 +258,6 @@
 %token  ELSEIF_SYM
 %token  ELT_FUNC
 %token  ENABLE_SYM
-%token  ENABLED_SYM
 %token  ENCLOSED
 %token  ENCODE_SYM
 %token  ENCRYPT
@@ -1446,14 +1444,14 @@
       ;
     
 opt_ev_status: /* empty */ {$<ulong_num>$= 0;}
-        | ENABLED_SYM
+        | ENABLE_SYM
           {
             LEX *lex=Lex;
             if (!lex->et_compile_phase)
               lex->et->status= MYSQL_EVENT_ENABLED;
             $<ulong_num>$= 1;	   
           }
-        | DISABLED_SYM
+        | DISABLE_SYM
           {
             LEX *lex=Lex;
             
@@ -9302,7 +9300,7 @@
 	| DELAY_KEY_WRITE_SYM	{}
 	| DES_KEY_FILE		{}
 	| DIRECTORY_SYM		{}
-	| DISABLED_SYM		{}
+	| DISABLE_SYM		{}
 	| DISCARD		{}
 	| DISK_SYM              {}
 	| DUMPFILE		{}
@@ -9322,9 +9320,7 @@
 	| EXTENT_SIZE_SYM       {}
 	| FAST_SYM		{}
 	| FOUND_SYM		{}
-	| DISABLE_SYM		{}
 	| ENABLE_SYM		{}
-	| ENABLED_SYM		{}
 	| FULL			{}
 	| FILE_SYM		{}
 	| FIRST_SYM		{}

--- 1.6/mysql-test/r/events.result	2006-01-20 22:24:51 +01:00
+++ 1.7/mysql-test/r/events.result	2006-01-24 16:04:19 +01:00
@@ -4,8 +4,9 @@
 Warnings:
 Note	1305	Event event1 does not exist
 create event event1 on schedule every 15 minute starts now() ends date_add(now(), interval 5 hour) DO begin end;
-alter event event1 rename to event2;
-alter event event2 disabled;
+alter event event1 rename to event2 enable;
+alter event event2 disable;
+alter event event2 enable;
 alter event event2 on completion not preserve;
 alter event event2 on schedule every 1 year on completion preserve rename to event3 comment "new comment" do begin select 1; end__
 alter event event3 rename to event2;

--- 1.7/mysql-test/t/events.test	2006-01-20 22:24:51 +01:00
+++ 1.8/mysql-test/t/events.test	2006-01-24 16:04:20 +01:00
@@ -2,8 +2,9 @@
 use events_test;
 drop event if exists event1;
 create event event1 on schedule every 15 minute starts now() ends date_add(now(), interval 5 hour) DO begin end;
-alter event event1 rename to event2;
-alter event event2 disabled;
+alter event event1 rename to event2 enable;
+alter event event2 disable;
+alter event event2 enable;
 alter event event2 on completion not preserve;
 delimiter __;
 alter event event2 on schedule every 1 year on completion preserve rename to event3 comment "new comment" do begin select 1; end__
Thread
bk commit into 5.1 tree (andrey:1.2072) BUG#16404ahristov24 Jan