Commit b3e35272 authored by unknown's avatar unknown
Browse files

WL #1034 update 

- enable/disable -> enabled/disabled
- fixed error message


sql/lex.h:
  change ENABLE to ENABLED and DISABLE to DISABLED in 
  create/alter event
sql/share/errmsg.txt:
  fix error msg
sql/sql_yacc.yy:
  ENABLE -> ENABLED
  DISABLE -> DISABLED
parent 3a12408a

sql/lex.h

+2 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ static SYMBOL symbols[] = { 
  { "DETERMINISTIC",    SYM(DETERMINISTIC_SYM)},

  { "DIRECTORY",	SYM(DIRECTORY_SYM)},

  { "DISABLE",		SYM(DISABLE_SYM)},

  { "DISABLED",		SYM(DISABLED_SYM)},

  { "DISCARD",		SYM(DISCARD)},

  { "DISTINCT",		SYM(DISTINCT)},

  { "DISTINCTROW",	SYM(DISTINCT)},	/* Access likes this */
@@ -180,6 +181,7 @@ 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/share/errmsg.txt

+2 −2
Original line number Diff line number Diff line
@@ -5726,9 +5726,9 @@ ER_EVENT_ALREADY_EXISTS 
ER_EVENT_STORE_FAILED

        eng "Failed to store event %s. Error code %d from storage engine."

ER_EVENT_DOES_NOT_EXIST

        eng "Unknown event '%s'"

        eng "Unknown event '%-.64s'"

ER_EVENT_CANT_ALTER

        eng "Failed to alter event %s"

        eng "Failed to alter event '%-.64s'"

ER_EVENT_DROP_FAILED

        eng "Failed to drop %s"

ER_EVENT_INTERVAL_NOT_POSITIVE

sql/sql_yacc.yy

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

%token  DIRECTORY_SYM

%token  DISABLE_SYM

%token  DISABLED_SYM

%token  DISCARD

%token  DISTINCT

%token  DIV_SYM
@@ -254,6 +255,7 @@ 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
@@ -1410,13 +1412,13 @@ ev_schedule_time: EVERY_SYM expr interval 
      ;

    

ev_status: /* empty */

        | ENABLE_SYM

        | ENABLED_SYM

          {

            LEX *lex=Lex;

            if (!lex->et_compile_phase)

              lex->et->status= MYSQL_EVENT_ENABLED;	   

          }

        | DISABLE_SYM

        | DISABLED_SYM

          {

            LEX *lex=Lex;
@@ -8592,6 +8594,7 @@ keyword_sp: 
	| DELAY_KEY_WRITE_SYM	{}

	| DES_KEY_FILE		{}

	| DIRECTORY_SYM		{}

	| DISABLED_SYM		{}

	| DISCARD		{}

	| DUMPFILE		{}

	| DUPLICATE_SYM		{}
@@ -8611,6 +8614,7 @@ keyword_sp: 
	| FOUND_SYM		{}

	| DISABLE_SYM		{}

	| ENABLE_SYM		{}

	| ENABLED_SYM		{}

	| FULL			{}

	| FILE_SYM		{}

	| FIRST_SYM		{}