bzr push into mysql-next-mr-bugfixing branch (magne.mahre:3359 to 3360) WL#5185

[Magne Mahre]

 3360 Magne Mahre	2010-11-04
      WL#5185 post-push fix
      
      mysql-test-run was not able to run in version 1, since
      it uses --log and --log-slow-queries, and these were
      removed as part of the worklog.
      
      This in turn made RQG fail.
      
      Updated the v.1 mtr client to use the new syntax
      (--general-log, --general-log-file-name, etc.)

    modified:
      mysql-test/lib/v1/mysql-test-run.pl
 3359 Tor Didriksen	2010-11-04
      Bug #55790 Read_Master_Log_Pos is wrong
      
      Post-push fix: disable on windows, since it always fails.
     @ mysql-test/suite/rpl/t/rpl_packet.test
        We do not have grep/tail on windows.

    modified:
      mysql-test/suite/rpl/t/rpl_packet.test
=== modified file 'mysql-test/lib/v1/mysql-test-run.pl'
--- a/mysql-test/lib/v1/mysql-test-run.pl	2010-08-17 11:46:39 +0000
+++ b/mysql-test/lib/v1/mysql-test-run.pl	2010-11-04 10:32:57 +0000
@@ -2882,7 +2882,7 @@ sub run_benchmarks ($) {
 
   if ( ! $benchmark )
   {
-    mtr_add_arg($args, "--log");
+    mtr_add_arg($args, "--general-log");
     mtr_run("$glob_mysql_bench_dir/run-all-tests", $args, "", "", "", "");
     # FIXME check result code?!
   }
@@ -3912,10 +3912,12 @@ sub mysqld_arguments ($$$$) {
   }
 
   my $log_base_path= "$opt_vardir/log/$mysqld->{'type'}$sidx";
-  mtr_add_arg($args, "%s--log=%s.log", $prefix, $log_base_path);
-  mtr_add_arg($args,
-	      "%s--log-slow-queries=%s-slow.log", $prefix, $log_base_path);
 
+  mtr_add_arg($args, "%s--general-log", $prefix);
+  mtr_add_arg($args, "%s--general-log-file=%s.log", $prefix, $log_base_path);
+  mtr_add_arg($args, "%s--slow-query-log", $prefix);
+  mtr_add_arg($args,
+              "%s--slow-query-log-file=%s-slow.log", $prefix, $log_base_path);
   # Check if "extra_opt" contains --skip-log-bin
   my $skip_binlog= grep(/^--skip-log-bin/, @$extra_opt, @opt_extra_mysqld_opt);
   if ( $mysqld->{'type'} eq 'master' )

No bundle (reason: useless for push emails).