Commit e40ba8e5 authored by unknown's avatar unknown

Fix typos, evidently from previous bad merges, in mysql-test-run.pl and sql_yacc.yy


mysql-test/mysql-test-run.pl:
  Fix typo or bad merge (if -> elsif)
sql/sql_yacc.yy:
  Fix apparent bad merge: add ';' before ev_schedule_time: rule.
parent 4e434ea0
...@@ -3120,7 +3120,7 @@ sub mysqld_start ($$$) { ...@@ -3120,7 +3120,7 @@ sub mysqld_start ($$$) {
{ {
$exe= $exe_master_mysqld; $exe= $exe_master_mysqld;
} }
if ( $type eq 'slave' ) elsif ( $type eq 'slave' )
{ {
$exe= $exe_slave_mysqld; $exe= $exe_slave_mysqld;
} }
......
...@@ -1354,7 +1354,7 @@ event_tail: ...@@ -1354,7 +1354,7 @@ event_tail:
Lex->sql_command= SQLCOM_CREATE_EVENT; Lex->sql_command= SQLCOM_CREATE_EVENT;
Lex->expr_allows_subselect= TRUE; Lex->expr_allows_subselect= TRUE;
} }
;
ev_schedule_time: EVERY_SYM expr interval ev_schedule_time: EVERY_SYM expr interval
{ {
...@@ -1367,7 +1367,7 @@ ev_schedule_time: EVERY_SYM expr interval ...@@ -1367,7 +1367,7 @@ ev_schedule_time: EVERY_SYM expr interval
{ {
Lex->event_parse_data->item_execute_at= $2; Lex->event_parse_data->item_execute_at= $2;
} }
; ;
opt_ev_status: /* empty */ { $$= 0; } opt_ev_status: /* empty */ { $$= 0; }
| ENABLE_SYM | ENABLE_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