From: Tor Didriksen
Date: November 4 2010 9:20am
Subject: bzr commit into mysql-next-mr-bugfixing branch (tor.didriksen:3358) Bug#55790
List-Archive: http://lists.mysql.com/commits/122801
X-Bug: 55790
Message-Id: <20101104092044.1CEF235BB@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2431516740223216312=="

--===============2431516740223216312==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///export/home/didrik/repo/next-mr-bugfixing/ based on revid:magne.mahre@stripped

 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
=== 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
 


--===============2431516740223216312==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/tor.didriksen@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   rgnwzahii13duj83
# target_branch: file:///export/home/didrik/repo/next-mr-bugfixing/
# testament_sha1: 3467cf34ac360a8bfbd3c2a793fc16dba7385b35
# timestamp: 2010-11-04 10:20:43 +0100
# source_branch: file:///export/home/didrik/repo/trunk-bugfixing/
# base_revision_id: magne.mahre@stripped\
#   nblk67osg74tsvqw
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTscBbIAAY3fgEAQWGP//1YG
VAC////0UAPu7z1hzegOlUhqap5TNQ0emjU9NEANMgNGjQAFaow0DQNAExMmmRgIwmjTBkgaRiKf
lGiJ7Ep6mnqDCAwjEENJpNTRo9Q0BoADQA0AGQSSEaDQTE0Gk000I2TUmg9E8pmpSqWQq+UYc5kR
BC5FKADyWuQ8e07eL18M2zERCuo3dD9lAHsCQeEvl06/pnenhkLKQJtWjCpM1Q3L1tsdgLKaAyzG
ubFPkCLY1dZNi7zvdIHxO+ztTk3atKAjElDpcS17smpjKacV2jrVlm4RAE0y8XD0wmSk3HUmZh8V
OI1Tpj2J1GHpIXc+Ajucge/A3cniL1eoTSoAiNchSWQqiBgDPhGwaWDtP1jKA3xcx8nyFeVKI9h0
0IHZMq0LNVCpWNtkYUq9wbds6wVJNQUvXvvgpcE/HKYG0+U7hMuq4mjwsIgvFUyCU4SSDgp+OA8x
t1C6VPR0SOvV/kMWnu9/HEZWvrPlq/cFg314vGLEI4OMFgo6pKzcYWQwyHLrLM3ssaczhS9FkFYa
vqM4nDhFSUiGz9AZ6S6W1vuScscQ6oU4QMjJAZRERtoGc0E9iXl7qKt2Iqwc8IjK7xA0GpMJUUGq
QBCVxEGuRzspZJY1For4xTbmm0znSmCAHnNEs5tYssUjnioCKQy47WNOGhAOhDxFWIiUDgwU4mU6
61umlZ6Vovu+KyDWmnSFnlxUUx5TaRcELDPuqmA1BI0Ci6koTk3PE006siyJJeqRh9VWU4crXlOy
90llqpWBCZXWwMit+qbdglicakHpgLK8yZIvXg75yKs35D9OHfzVmhJ0igH/vyvWnSm+NXDuc+OD
ZfZZz5NT7OtAyyKEy5Z2k+mlBATN/CKAueoWLHWS1DnrWNWe/PY3Q03K4eQLn+TZJuX0h5Cbm5Zp
RvpZwVTILVNeJtKCyXUP+2JPi48BRArWaJjHQLafv8bsJsQ12KobkGw4vzV5R5zi6LeZwTkbQ6aA
UsN7O8ZBIKZ3r4mF3+GfWotEMuL1txuwvJFx7TkblcLxuV7hp3MZCzICKXFHEp7nm5QKl9Lx0HTT
xE9kyiLLlF3rX+tuYKuoOs6+a0v2IYK17rRPXz2TeuuW68OPbVzRvcwRUSjBKa00OdHCFhx8zfnN
hOoCAmvaXkS68RQF0bcwBMurMHpyW3l5zLIclQWN9mDcq9hNZuUQMqFCTyuoGqWGN1zR7i0UkA2O
AhfxudI6rdpsATvZfMibVhAN2zmjavR7aJoBj9XUDsJF9Mie0xGf2kF4RZdlf12fh/hQQF59Xryv
5e63h2Vy4BQuSvVywriJ5EP79VOt6+6vO+zhN9Ba5CanD/i7kinChIHY4C2Q


--===============2431516740223216312==--