From: Tor Didriksen
Date: November 4 2010 9:20am
Subject: bzr push into mysql-next-mr-bugfixing branch (tor.didriksen:3357 to 3358)
 Bug#55790
List-Archive: http://lists.mysql.com/commits/122802
X-Bug: 55790
Message-Id: <20101104092054.D202D35BB@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3358 Tor Didriksen	2010-11-04
      Bug #55790 Read_Master_Log_Pos is wrong 
      Post-push fix: use portable argument to tail.
     @ mysql-test/suite/rpl/t/rpl_packet.test
        tail -n is not supported on solaris.

    modified:
      mysql-test/suite/rpl/t/rpl_packet.test
 3357 Magne Mahre	2010-11-03
      WL#5185 post-push fix
      
      Two MS Windows specific regression tests failed
      after the pushd.   In addition, the entire
      'parts' regression test suite was disabled, due
      to the removal of the 'have_partitioning' variable.
     @ mysql-test/include/have_partition.inc
        Using INFORMATION_SCHEMA to test for partitioning 
        support, instead of the old (and removed)
        have_partitioning variable

    modified:
      mysql-test/include/have_partition.inc
      mysql-test/r/mysqld--help-win.result
      mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result
=== modified file 'mysql-test/suite/rpl/t/rpl_packet.test'
--- a/mysql-test/suite/rpl/t/rpl_packet.test	2010-11-01 05:40:27 +0000
+++ b/mysql-test/suite/rpl/t/rpl_packet.test	2010-11-04 09:20:38 +0000
@@ -200,7 +200,7 @@ INSERT INTO t1 VALUES (REPEAT('a', 2048)
 --replace_regex /#[0-9]*[ ]*[0-9]*:[0-9]*:[0-9]* server id [0-9]*/#server id #/ /mapped to number [0-9]*/mapped to number #/
 exec $MYSQL_BINLOG $MYSQLD_DATADIR/$binlog_file 2> $MYSQLD_TMPDIR/warning.txt
  | grep 'end_log_pos'
- | tail -n 1;
+ | tail -1;
 --cat_file $MYSQLD_TMPDIR/warning.txt
 --remove_file $MYSQLD_TMPDIR/warning.txt
 

No bundle (reason: useless for push emails).