From: Serge Kozlov
Date: April 27 2011 9:06pm
Subject: bzr commit into mysql-trunk branch (Serge.Kozlov:3331) Bug#11761610
List-Archive: http://lists.mysql.com/commits/136470
X-Bug: 11761610
Message-Id: <201104272106.p3RL699Q027349@localhost.localdomain>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1520178197=="

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

#At file:///home/ksm/oracle/repo/bugs_suite/mysql-trunk/ based on revid:sven.sandberg@stripped

 3331 Serge Kozlov	2011-04-28
      BUG#11761610. Add waiting of binlog files from mysqlbinlog that running in background.

    modified:
      mysql-test/t/mysqlbinlog_raw_mode.test
=== modified file 'mysql-test/t/mysqlbinlog_raw_mode.test'
--- a/mysql-test/t/mysqlbinlog_raw_mode.test	2011-03-07 15:17:39 +0000
+++ b/mysql-test/t/mysqlbinlog_raw_mode.test	2011-04-27 21:05:54 +0000
@@ -10,14 +10,35 @@ CREATE TABLE raw_mode_exit (exit_code IN
 # Now jump some loops to have mysqlbinlog executed in the background
 --write_file $MYSQL_TMP_DIR/mbl.sh
 #!/bin/sh
-(`$MYSQL_BINLOG --raw --read-from-remote-server --stop-never --user=root --host=127.0.0.1 --port=$MASTER_MYPORT --result-file=$MYSQLTEST_VARDIR/tmp/ master-bin.000001 ; [ $? -le 1 ]` && $MYSQL -e "use test; INSERT INTO raw_mode_exit VALUES (1);") < /dev/null > /dev/null 2>&1 &
+(`$MYSQL_BINLOG --raw --read-from-remote-server --stop-never --user=root --host=127.0.0.1 --port=$MASTER_MYPORT --result-file=$MYSQL_TMP_DIR/ master-bin.000001 ; [ $? -le 1 ]` && $MYSQL -e "use test; INSERT INTO raw_mode_exit VALUES (1);") < /dev/null > /dev/null 2>&1 &
 EOF
 --chmod 0755 $MYSQL_TMP_DIR/mbl.sh
 --exec $MYSQL_TMP_DIR/mbl.sh
 let $wait_condition= SELECT id from information_schema.processlist where processlist.command like '%Binlog%' and state like '%Master has sent%';
 --source include/wait_condition.inc
---diff_files $MYSQLTEST_VARDIR/tmp/master-bin.000001 $MYSQLD_DATADIR/master-bin.000001
---diff_files $MYSQLTEST_VARDIR/tmp/master-bin.000002 $MYSQLD_DATADIR/master-bin.000002
+
+# Wait until creating binlog files by mysqlbinlog 
+--perl
+$timeout= 30;
+$binlog= $ENV{'MYSQL_TMP_DIR'} . '/master-bin.000002';
+$binlog_exists= 0;
+while ($timeout > 0 && $binlog_exists == 0)
+{
+    if (-e $binlog)
+    {
+	$binlog_exists= 1;
+    }
+    sleep 1;
+    $timeout--;
+}
+if ($timeout == 0 && $binlog_exists == 0)
+{
+    print "Timeout reached but binlog file $binlog was not created";
+}
+EOF
+
+--diff_files $MYSQL_TMP_DIR/master-bin.000001 $MYSQLD_DATADIR/master-bin.000001
+--diff_files $MYSQL_TMP_DIR/master-bin.000002 $MYSQLD_DATADIR/master-bin.000002
 
 SELECT ((@id := id) - id) from information_schema.processlist where processlist.command like '%Binlog%' and state like '%Master has sent%';
 # Test killing from mysql server
@@ -26,9 +47,9 @@ kill @id;
 --source include/wait_condition.inc
 
 DROP TABLE raw_mode_exit;
---remove_file $MYSQLTEST_VARDIR/tmp/master-bin.000001
---remove_file $MYSQLTEST_VARDIR/tmp/master-bin.000002
---remove_file $MYSQLTEST_VARDIR/tmp/master-bin.000003
+--remove_file $MYSQL_TMP_DIR/master-bin.000001
+--remove_file $MYSQL_TMP_DIR/master-bin.000002
+--remove_file $MYSQL_TMP_DIR/master-bin.000003
 --remove_file $MYSQL_TMP_DIR/mbl.sh
 
 --echo End of tests


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: serge.kozlov@stripped
# target_branch: file:///home/ksm/oracle/repo/bugs_suite/mysql-trunk/
# testament_sha1: 0d2407c64dcf2cc9f6f982ed4f151fe4c324307f
# timestamp: 2011-04-28 01:06:08 +0400
# source_branch: file:///home/ksm/oracle/repo/bugs_suite/mysql-5.5/
# base_revision_id: sven.sandberg@stripped\
#   c46jcvdtabt1ytpb
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWYuaU8AAjFfgGAwXeP///ev
/6r////6UAVMLe7LY3cunXbtR2zrcJJE0mCT9SYmJ6amKep4ptRo002iGgyDTEBo2oJJKbCjaaCF
NqfpNTJhMjRo0ADQAANDQNNJoSYho01R5PTU9U2jBQ09IPQh6mg9QAek0BxoyZGEYgGE0GATQaBk
yaMmQwgMJIknlGBGRpPUymGo9QaNNANDQAZDTQBIKKCHhe03su5vQf2wrIV5KDbhfbY7J3tctuoY
dayz2hEBMvHa9rX370oIuhN5AR4Thv3aO/TgfwJKMG91Yz/KB9UJz5e7d2jq6K9XN0Gr54SSAo/R
+6UPopUZ+EXR0mtmzmNwOcozd0/GJly8uShtjS4W5rfxO075SOH9hFupv3ZB/I7fOoMyh7pV2UNk
x+PyVZUlbncgPPrUOKeJVRGIO3rG1zbEKa21cv2eErYOG8YsOG0WmZMmWsrMgjH0ZEDlvjzYKXUr
1s/sOfV2+iATYLOB3E0tFGmgYpIFNhVA21FMLmbHxkaZToMaDU2lhuMeYQOggVYgTu7nq0wDkAYE
I56Kix7aJIyRsprEuKbcCDmW+Xm+9YV266F1vsZBeK4wviI9BzdD+aN22uTLbpxgX4zWBdWt6x3A
TiaDO2OI7hZWkMMs4mzAt4VsezVuo09gLbzGnOJ9O2VJTMgDEYKWAjKJZLLzxAPMjiYOWOR5xS3l
RqIV8Iu3lqSbLWq5yZQdBYORN17Qdy9pmcsyYyZ6/BOQs7GuQnF5ua2HqKykHXZZkRP04V5HtVB9
zy/q5AfOytZlhVOtcHSw9iwucy0LO4VUWeKc1eLAmPzSJaL3FhfZNh74daEKqTL9Ls0QrJOzqNmm
hEeVmW25UJ5VuzuvzMxapQ+DkKzq8SARikixENJny5O90keY4PGthKYKsTsziR7TrxW+Z5f4ur0R
WdL1n57esoibzDHfs6HDoYZl7yNkvjV1e4biqK0Dd7qX3scCmdKxw2sLpVuJrer83pXJEkF0lXFI
rv5/aQMmVKXBXfomawExJgN1Kl6VgVhsG06HB3BBcOeC7+nXIuMaXj2+2dVerJypEasjR7tTw/l1
3rwnCK9NiJd4Rc1GaKNnmJW9PlLuw9+Z8Z2sGrXyOhB8Zk3Iky4i4pDnFuTzLbU4rxllAzAudIqq
H7VWVM/FO6OSmB1ClUFodvyrpeqeR/9BP2DEKxc7EgyJxAEjQcM4xsyICEcuqkENiqDDK0DXqm4J
mpdTFQnDUeRhvpNFZtMW0UKzHfufNrXc4iG6nDjplnRCBYgu0PpyrlHS1jZg10STUzlrhyoxI+As
zeDisGsOUQAuJo69HK5gRcF9RqL1usUIKWnAjJcjgJURjxizSetoNM8nLC5GsmR2M4uhgmqj9sQh
pDssA57GDSVILQyTUtMkqvFhdLOF4fNG4b1W5xK0VmqOJaX7+TEN0XGLlFSVDe5rqBAHuCpD0b7U
pDLWScMvgNLWpK0B56dXHtQuRb7IuVNSOsxqlgGgIxNuD0FHMblJQyCqhQ3xMY6biQOpscAbRigk
mjjIMQZOyoHW5mCmWdJPgIZiIaYGBvBIcFZQrPKSLTeuxdZTdRcsEyUq25xNCaSN/GzKiqNUGu1c
cY5UqVmLIWZJb9e6qDtYwRQ1fXeZUi8bHloIMFeBzxjZGTSyQ5Jk5MMVus+q7Yo3nAbBs5oZmzcI
NtqXFqqJ+lKq4YuYuQV1hWEzhhGOAQLi50zrcEbEzwhJyOhqC0odV1osgFWOu+QS+M03SC0xWxoR
FXrY98wTwUsznDi3p5Fc27PiNLBgb3YRATMlamUlYq46GC0UsEUN/VACRRi9LwqWgnaBNlpOxzjr
/4u5IpwoSDMXNKeA


--===============1520178197==--