bzr commit into mysql-trunk branch (Serge.Kozlov:3366) Bug#11747313 Bug#11761610

[Serge Kozlov]

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

 3366 Serge Kozlov	2011-05-05
      BUG#11761610
      1. Replace binlog file suffix to 000003
      2. The patch that makes the test case to pass on freebsd. 
      The test relies on a shell script that was executed using MTR 
      "system" command. However, "system" was deprecated and the test 
      case was changed to use exec + /bin/sh instead (see BUG#11747313).
      But the shell script actually needs /bin/bash to succeed, 
      otherwise it will just hang, thence the timeout.
      Since FreeBSDs boxes seem to have /bin/bash installed, we change 
      it from /bin/sh to /bin/bash to make the test pass again.

    modified:
      mysql-test/collections/default.experimental
      mysql-test/t/mysqlbinlog_raw_mode.test
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2011-05-02 14:43:45 +0000
+++ b/mysql-test/collections/default.experimental	2011-05-05 11:00:01 +0000
@@ -9,7 +9,6 @@ funcs_1.charset_collation_1             
 main.func_math @freebsd                  # Bug#43020 2010-05-04 alik main.func_math fails on FreeBSD in PB2
 main.gis-rtree @freebsd                  # Bug#38965 2010-05-04 alik test cases gis-rtree, type_float, type_newdecimal fail in embedded server
 main.lock_multi_bug38499                 # Bug#47448 2009-09-19 alik main.lock_multi_bug38499 times out sporadically
-main.mysqlbinlog_raw_mode                # BUG#11761610 2011-04-11 sven fails on pb2
 main.mysqlslap @windows                  # Bug#54024 2010-08-10 alik mysqlslap fails sporadically starting from Dahlia
 main.outfile_loaddata @solaris           # Bug#46895 2010-01-20 alik Test "outfile_loaddata" fails (reproducible)
 main.signal_demo3 @solaris               # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun

=== modified file 'mysql-test/t/mysqlbinlog_raw_mode.test'
--- a/mysql-test/t/mysqlbinlog_raw_mode.test	2011-04-27 21:05:54 +0000
+++ b/mysql-test/t/mysqlbinlog_raw_mode.test	2011-05-05 11:00:01 +0000
@@ -9,7 +9,7 @@
 CREATE TABLE raw_mode_exit (exit_code INT);
 # Now jump some loops to have mysqlbinlog executed in the background
 --write_file $MYSQL_TMP_DIR/mbl.sh
-#!/bin/sh
+#!/bin/bash
 (`$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
@@ -20,7 +20,7 @@ let $wait_condition= SELECT id from info
 # Wait until creating binlog files by mysqlbinlog 
 --perl
 $timeout= 30;
-$binlog= $ENV{'MYSQL_TMP_DIR'} . '/master-bin.000002';
+$binlog= $ENV{'MYSQL_TMP_DIR'} . '/master-bin.000003';
 $binlog_exists= 0;
 while ($timeout > 0 && $binlog_exists == 0)
 {


Attachment: [text/bzr-bundle] bzr/[e-mail]