summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xmysql-test/mysql-test-run.pl2
-rw-r--r--sql/sql_yacc.yy4
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index d020310832f..268783fa6d3 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3120,7 +3120,7 @@ sub mysqld_start ($$$) {
{
$exe= $exe_master_mysqld;
}
- if ( $type eq 'slave' )
+ elsif ( $type eq 'slave' )
{
$exe= $exe_slave_mysqld;
}
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index d4e0c5ed907..16de271e6ed 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -1354,7 +1354,7 @@ event_tail:
Lex->sql_command= SQLCOM_CREATE_EVENT;
Lex->expr_allows_subselect= TRUE;
}
-
+ ;
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;
}
- ;
+ ;
opt_ev_status: /* empty */ { $$= 0; }
| ENABLE_SYM