From: Bjorn Munch
Date: February 28 2011 3:16pm
Subject: bzr push into mysql-5.1-mtr branch (bjorn.munch:2983 to 2984)
List-Archive: http://lists.mysql.com/commits/132133
Message-Id: <201102281516.p1SFGVkd026017@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 2984 Bjorn Munch	2011-02-28
      Attempt at solving missing end of mtr output on Windows

    modified:
      mysql-test/lib/mtr_report.pm
 2983 Bjorn Munch	2011-02-24 [merge]
      merge from 5.1 main

    added:
      mysql-test/suite/innodb/r/innodb_bug60049.result
      mysql-test/suite/innodb/t/innodb_bug60049-master.opt
      mysql-test/suite/innodb/t/innodb_bug60049.test
      mysql-test/suite/innodb_plugin/r/innodb_bug59307.result
      mysql-test/suite/innodb_plugin/r/innodb_bug60049.result
      mysql-test/suite/innodb_plugin/t/innodb_bug59307.test
      mysql-test/suite/innodb_plugin/t/innodb_bug60049-master.opt
      mysql-test/suite/innodb_plugin/t/innodb_bug60049.test
    modified:
      README
      client/mysql.cc
      client/mysqldump.c
      client/readline.cc
      configure.in
      include/my_bit.h
      include/my_bitmap.h
      mysql-test/r/ctype_cp1250_ch.result
      mysql-test/r/ctype_cp1251.result
      mysql-test/r/ctype_eucjpms.result*
      mysql-test/r/ddl_i18n_koi8r.result
      mysql-test/r/ddl_i18n_utf8.result
      mysql-test/r/gis.result
      mysql-test/r/group_by.result
      mysql-test/r/insert_select.result
      mysql-test/r/mysqldump.result
      mysql-test/suite/innodb_plugin/t/innodb_information_schema.test
      mysql-test/t/ctype_cp1250_ch.test
      mysql-test/t/ctype_cp1251.test
      mysql-test/t/ctype_eucjpms.test
      mysql-test/t/gis.test
      mysql-test/t/group_by.test
      mysql-test/t/insert_select.test
      mysql-test/t/mysqldump.test
      mysys/my_bitmap.c
      sql/mysql_priv.h
      sql/set_var.cc
      sql/sql_connect.cc
      sql/sql_parse.cc
      sql/sql_select.cc
      sql/sql_string.h
      storage/innodb_plugin/ChangeLog
      storage/innodb_plugin/btr/btr0btr.c
      storage/innodb_plugin/btr/btr0cur.c
      storage/innodb_plugin/dict/dict0mem.c
      storage/innodb_plugin/handler/handler0alter.cc
      storage/innodb_plugin/include/btr0btr.h
      storage/innodb_plugin/include/btr0types.h
      storage/innodb_plugin/include/dict0mem.h
      storage/innodb_plugin/include/page0zip.h
      storage/innodb_plugin/include/univ.i
      storage/innodb_plugin/page/page0cur.c
      storage/innodb_plugin/page/page0page.c
      storage/innodb_plugin/page/page0zip.c
      storage/innodb_plugin/row/row0upd.c
      storage/innodb_plugin/srv/srv0start.c
      storage/innodb_plugin/sync/sync0rw.c
      storage/myisam/mi_create.c
      support-files/mysql.spec.sh
      tests/mysql_client_test.c
      unittest/mysys/bitmap-t.c
=== modified file 'mysql-test/lib/mtr_report.pm'
--- a/mysql-test/lib/mtr_report.pm	2011-01-18 10:03:44 +0000
+++ b/mysql-test/lib/mtr_report.pm	2011-02-28 15:10:35 +0000
@@ -32,6 +32,7 @@ our @EXPORT= qw(report_option mtr_print_
 use mtr_match;
 use My::Platform;
 use POSIX qw[ _exit ];
+use IO::Handle qw[ flush ];
 require "mtr_io.pl";
 
 my $tot_real_time= 0;
@@ -477,6 +478,7 @@ sub mtr_warning (@) {
 
 # Print error to screen and then exit
 sub mtr_error (@) {
+  IO::Handle::flush(\*STDOUT) if IS_WINDOWS;
   print STDERR _name(). _timestamp().
     "mysql-test-run: *** ERROR: ". join(" ", @_). "\n";
   if (IS_WINDOWS)

No bundle (reason: useless for push emails).