bzr commit into MySQL/Maria:mysql-maria branch (monty:2708)

[Michael Widenius]

#At bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-maria/

 2708 Michael Widenius	2008-12-10
      Added missing prefix to options that caused --embedded to fail
modified:
  mysql-test/mysql-test-run.pl

per-file messages:
  mysql-test/mysql-test-run.pl
    Added missing prefix to options that caused --embedded to fail
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2008-12-09 10:29:33 +0000
+++ b/mysql-test/mysql-test-run.pl	2008-12-10 16:31:50 +0000
@@ -4008,11 +4008,11 @@ sub mysqld_arguments ($$$$) {
   my $log_base_path= "$opt_vardir/log/$mysqld->{'type'}$sidx";
   mtr_add_arg($args, "%s--general-log-file=%s.log",
               $prefix, $log_base_path);
-  mtr_add_arg($args, "--general-log");
+  mtr_add_arg($args, "%s--general-log", $prefix);
   mtr_add_arg($args,
 	      "%s--slow-query-log-file=%s-slow.log",
               $prefix, $log_base_path);
-  mtr_add_arg($args, "--slow-query-log");
+  mtr_add_arg($args, "%s--slow-query-log", $prefix);
 
   # Check if "extra_opt" contains --skip-log-bin
   my $skip_binlog= grep(/^--skip-log-bin/, @$extra_opt, @opt_extra_mysqld_opt);