Commit 5c974cf1 authored by unknown's avatar unknown
Browse files

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into lmy004.:/work/mysql-5.1-bug16404
parents 63fd0bc1 679aef1b

mysql-test/r/events.result

+3 −2
Original line number Diff line number Diff line
@@ -4,8 +4,9 @@ drop event if exists event1; 
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;

mysql-test/t/events.test

+3 −2
Original line number Diff line number Diff line
@@ -2,8 +2,9 @@ create database if not exists events_test; 
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__

sql/lex.h

+0 −2
Original line number Diff line number Diff line
@@ -168,7 +168,6 @@ static SYMBOL symbols[] = { 
  { "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 @@ static SYMBOL symbols[] = { 
  { "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)},

sql/sql_yacc.yy

+3 −7
Original line number Diff line number Diff line
@@ -243,7 +243,6 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); 
%token  DETERMINISTIC_SYM

%token  DIRECTORY_SYM

%token  DISABLE_SYM

%token  DISABLED_SYM

%token  DISCARD

%token  DISK_SYM

%token  DISTINCT
@@ -259,7 +258,6 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); 
%token  ELSEIF_SYM

%token  ELT_FUNC

%token  ENABLE_SYM

%token  ENABLED_SYM

%token  ENCLOSED

%token  ENCODE_SYM

%token  ENCRYPT
@@ -1446,14 +1444,14 @@ ev_schedule_time: EVERY_SYM expr interval 
      ;

    

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 @@ keyword_sp: 
	| DELAY_KEY_WRITE_SYM	{}

	| DES_KEY_FILE		{}

	| DIRECTORY_SYM		{}

	| DISABLED_SYM		{}

	| DISABLE_SYM		{}

	| DISCARD		{}

	| DISK_SYM              {}

	| DUMPFILE		{}
@@ -9322,9 +9320,7 @@ keyword_sp: 
	| EXTENT_SIZE_SYM       {}

	| FAST_SYM		{}

	| FOUND_SYM		{}

	| DISABLE_SYM		{}

	| ENABLE_SYM		{}

	| ENABLED_SYM		{}

	| FULL			{}

	| FILE_SYM		{}

	| FIRST_SYM		{}