Merge neptunus.(none):/home/msvensson/mysql/work/my50-work

into  neptunus.(none):/home/msvensson/mysql/work/my51-work


mysql-test/mysql-test-run.pl:
  Auto merged

mysql-test/mysql-test-run.pl

@@ -3554,6 +3554,11 @@ sub mysqld_arguments ($$$$$) {
       # Force mysqld to use log files up until 5.1.6
       mtr_add_arg($args, "%s--log=%s", $prefix, $master->[0]->{'path_mylog'});
     }
+    else
+    {
+      # Turn on logging, will be sent to tables
+      mtr_add_arg($args, "%s--log=", $prefix);
+    }
   }
 
   if ( $type eq 'slave' )
@@ -3637,6 +3642,11 @@ sub mysqld_arguments ($$$$$) {
       # Force mysqld to use log files up until 5.1.6
       mtr_add_arg($args, "%s--log=%s", $prefix, $master->[0]->{'path_mylog'});
     }
+    else
+    {
+      # Turn on logging, will be sent to tables
+      mtr_add_arg($args, "%s--log=", $prefix);
+    }
 
   } # end slave