Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-nn

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-nn


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/include/federated.inc:
  Auto merged

mysql-test/include/federated.inc

+--source include/have_log_bin.inc
 --source include/not_embedded.inc
 --source ./include/have_federated_db.inc
 

mysql-test/mysql-test-run.pl

@@ -3782,8 +3782,7 @@ sub mysqld_arguments ($$$$) {
 	      "%s--log-slow-queries=%s-slow.log", $prefix, $log_base_path);
 
   # Check if "extra_opt" contains --skip-log-bin
-  my $skip_binlog= grep(/^--skip-log-bin/, @$extra_opt);
-
+  my $skip_binlog= grep(/^--skip-log-bin/, @$extra_opt, @opt_extra_mysqld_opt);
   if ( $mysqld->{'type'} eq 'master' )
   {
     if (! ($opt_skip_master_binlog || $skip_binlog) )

mysql-test/r/have_log_bin.require

 Variable_name	Value
-have_log_bin	ON
+log_bin	ON