Commit b3e35272 authored by unknown's avatar unknown

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
...@@ -165,6 +165,7 @@ static SYMBOL symbols[] = { ...@@ -165,6 +165,7 @@ static SYMBOL symbols[] = {
{ "DETERMINISTIC", SYM(DETERMINISTIC_SYM)}, { "DETERMINISTIC", SYM(DETERMINISTIC_SYM)},
{ "DIRECTORY", SYM(DIRECTORY_SYM)}, { "DIRECTORY", SYM(DIRECTORY_SYM)},
{ "DISABLE", SYM(DISABLE_SYM)}, { "DISABLE", SYM(DISABLE_SYM)},
{ "DISABLED", SYM(DISABLED_SYM)},
{ "DISCARD", SYM(DISCARD)}, { "DISCARD", SYM(DISCARD)},
{ "DISTINCT", SYM(DISTINCT)}, { "DISTINCT", SYM(DISTINCT)},
{ "DISTINCTROW", SYM(DISTINCT)}, /* Access likes this */ { "DISTINCTROW", SYM(DISTINCT)}, /* Access likes this */
...@@ -180,6 +181,7 @@ static SYMBOL symbols[] = { ...@@ -180,6 +181,7 @@ static SYMBOL symbols[] = {
{ "ELSE", SYM(ELSE)}, { "ELSE", SYM(ELSE)},
{ "ELSEIF", SYM(ELSEIF_SYM)}, { "ELSEIF", SYM(ELSEIF_SYM)},
{ "ENABLE", SYM(ENABLE_SYM)}, { "ENABLE", SYM(ENABLE_SYM)},
{ "ENABLED", SYM(ENABLED_SYM)},
{ "ENCLOSED", SYM(ENCLOSED)}, { "ENCLOSED", SYM(ENCLOSED)},
{ "END", SYM(END)}, { "END", SYM(END)},
{ "ENDS", SYM(ENDS_SYM)}, { "ENDS", SYM(ENDS_SYM)},
......
...@@ -5726,9 +5726,9 @@ ER_EVENT_ALREADY_EXISTS ...@@ -5726,9 +5726,9 @@ ER_EVENT_ALREADY_EXISTS
ER_EVENT_STORE_FAILED ER_EVENT_STORE_FAILED
eng "Failed to store event %s. Error code %d from storage engine." eng "Failed to store event %s. Error code %d from storage engine."
ER_EVENT_DOES_NOT_EXIST ER_EVENT_DOES_NOT_EXIST
eng "Unknown event '%s'" eng "Unknown event '%-.64s'"
ER_EVENT_CANT_ALTER ER_EVENT_CANT_ALTER
eng "Failed to alter event %s" eng "Failed to alter event '%-.64s'"
ER_EVENT_DROP_FAILED ER_EVENT_DROP_FAILED
eng "Failed to drop %s" eng "Failed to drop %s"
ER_EVENT_INTERVAL_NOT_POSITIVE ER_EVENT_INTERVAL_NOT_POSITIVE
......
...@@ -240,6 +240,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); ...@@ -240,6 +240,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
%token DETERMINISTIC_SYM %token DETERMINISTIC_SYM
%token DIRECTORY_SYM %token DIRECTORY_SYM
%token DISABLE_SYM %token DISABLE_SYM
%token DISABLED_SYM
%token DISCARD %token DISCARD
%token DISTINCT %token DISTINCT
%token DIV_SYM %token DIV_SYM
...@@ -254,6 +255,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); ...@@ -254,6 +255,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
%token ELSEIF_SYM %token ELSEIF_SYM
%token ELT_FUNC %token ELT_FUNC
%token ENABLE_SYM %token ENABLE_SYM
%token ENABLED_SYM
%token ENCLOSED %token ENCLOSED
%token ENCODE_SYM %token ENCODE_SYM
%token ENCRYPT %token ENCRYPT
...@@ -1410,13 +1412,13 @@ ev_schedule_time: EVERY_SYM expr interval ...@@ -1410,13 +1412,13 @@ ev_schedule_time: EVERY_SYM expr interval
; ;
ev_status: /* empty */ ev_status: /* empty */
| ENABLE_SYM | ENABLED_SYM
{ {
LEX *lex=Lex; LEX *lex=Lex;
if (!lex->et_compile_phase) if (!lex->et_compile_phase)
lex->et->status= MYSQL_EVENT_ENABLED; lex->et->status= MYSQL_EVENT_ENABLED;
} }
| DISABLE_SYM | DISABLED_SYM
{ {
LEX *lex=Lex; LEX *lex=Lex;
...@@ -8592,6 +8594,7 @@ keyword_sp: ...@@ -8592,6 +8594,7 @@ keyword_sp:
| DELAY_KEY_WRITE_SYM {} | DELAY_KEY_WRITE_SYM {}
| DES_KEY_FILE {} | DES_KEY_FILE {}
| DIRECTORY_SYM {} | DIRECTORY_SYM {}
| DISABLED_SYM {}
| DISCARD {} | DISCARD {}
| DUMPFILE {} | DUMPFILE {}
| DUPLICATE_SYM {} | DUPLICATE_SYM {}
...@@ -8611,6 +8614,7 @@ keyword_sp: ...@@ -8611,6 +8614,7 @@ keyword_sp:
| FOUND_SYM {} | FOUND_SYM {}
| DISABLE_SYM {} | DISABLE_SYM {}
| ENABLE_SYM {} | ENABLE_SYM {}
| ENABLED_SYM {}
| FULL {} | FULL {}
| FILE_SYM {} | FILE_SYM {}
| FIRST_SYM {} | FIRST_SYM {}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment