diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-09-21 01:33:50 -0600 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-09-21 01:33:50 -0600 |
| commit | e40ba8e52359834c313cb58963f167ce624d12ea (patch) | |
| tree | 574aa00fa813d2c509f300d2be8e22cb9fc50673 | |
| parent | 4e434ea0931cd555654dbb9c770d3ce1a4bd130c (diff) | |
| download | mariadb-git-e40ba8e52359834c313cb58963f167ce624d12ea.tar.gz | |
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.
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 4 |
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 |