bzr push into mysql-6.0 branch (msvensson:2680 to 2681)

[Magnus Svensson]

 2681 Magnus Svensson	2008-08-29 [merge]
      Merge
modified:
  mysql-test/mysql-test-run.pl

 2680 Magnus Svensson	2008-08-29 [merge]
      merge

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2008-08-29 10:37:57 +0000
+++ b/mysql-test/mysql-test-run.pl	2008-08-29 12:47:02 +0000
@@ -3671,6 +3671,11 @@ sub mysqld_arguments ($$$) {
     {
       ; # Dont add --binlog-format when running without binlog
     }
+    elsif ($arg eq "--loose-skip-log-bin" and
+           $mysqld->option("log-slave-updates"))
+    {
+      ; # Dont add --skip-log-bin when mysqld have --log-slave-updates in config
+    }
     else
     {
       mtr_add_arg($args, "%s", $arg);