bk commit into 5.1 tree (tsmith:1.2344)

[tim]

Below is the list of changes that have just been committed into a local
5.1 repository of tim. When tim does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-21 01:33:50-06:00, tsmith@stripped +2 -0
  Fix typos, evidently from previous bad merges, in mysql-test-run.pl and sql_yacc.yy

  mysql-test/mysql-test-run.pl@stripped, 2006-09-21 01:33:39-06:00, tsmith@stripped +1
-1
    Fix typo or bad merge (if -> elsif)

  sql/sql_yacc.yy@stripped, 2006-09-21 01:33:39-06:00, tsmith@stripped +2 -2
    Fix apparent bad merge: add ';' before ev_schedule_time: rule.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tsmith
# Host:	siva.hindu.god
# Root:	/usr/home/tim/m/bk/inno/51-t

--- 1.498/sql/sql_yacc.yy	2006-09-21 01:34:04 -06:00
+++ 1.499/sql/sql_yacc.yy	2006-09-21 01:34:04 -06:00
@@ -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 interva
           {
             Lex->event_parse_data->item_execute_at= $2;
           }
-      ;
+        ;
 
 opt_ev_status: /* empty */ { $$= 0; }
         | ENABLE_SYM

--- 1.179/mysql-test/mysql-test-run.pl	2006-09-21 01:34:04 -06:00
+++ 1.180/mysql-test/mysql-test-run.pl	2006-09-21 01:34:04 -06:00
@@ -3120,7 +3120,7 @@ sub mysqld_start ($$$) {
   {
     $exe= $exe_master_mysqld;
   }
-  if ( $type eq 'slave' )
+  elsif ( $type eq 'slave' )
   {
     $exe= $exe_slave_mysqld;
   }