Skip to content

Commit 016f85d

Browse files
Serge KozlovSerge Kozlov
Serge Kozlov
authored and
Serge Kozlov
committed
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.
1 parent 451763d commit 016f85d

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

mysql-test/collections/default.experimental

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ funcs_1.charset_collation_1 # depends on compile-time decisions
99
main.func_math @freebsd # Bug#43020 2010-05-04 alik main.func_math fails on FreeBSD in PB2
1010
main.gis-rtree @freebsd # Bug#38965 2010-05-04 alik test cases gis-rtree, type_float, type_newdecimal fail in embedded server
1111
main.lock_multi_bug38499 # Bug#47448 2009-09-19 alik main.lock_multi_bug38499 times out sporadically
12-
main.mysqlbinlog_raw_mode # BUG#11761610 2011-04-11 sven fails on pb2
1312
main.mysqlslap @windows # Bug#54024 2010-08-10 alik mysqlslap fails sporadically starting from Dahlia
1413
main.outfile_loaddata @solaris # Bug#46895 2010-01-20 alik Test "outfile_loaddata" fails (reproducible)
1514
main.signal_demo3 @solaris # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun

mysql-test/t/mysqlbinlog_raw_mode.test

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
CREATE TABLE raw_mode_exit (exit_code INT);
1010
# Now jump some loops to have mysqlbinlog executed in the background
1111
--write_file $MYSQL_TMP_DIR/mbl.sh
12-
#!/bin/sh
12+
#!/bin/bash
1313
(`$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 &
1414
EOF
1515
--chmod 0755 $MYSQL_TMP_DIR/mbl.sh
@@ -20,7 +20,7 @@ let $wait_condition= SELECT id from information_schema.processlist where process
2020
# Wait until creating binlog files by mysqlbinlog
2121
--perl
2222
$timeout= 30;
23-
$binlog= $ENV{'MYSQL_TMP_DIR'} . '/master-bin.000002';
23+
$binlog= $ENV{'MYSQL_TMP_DIR'} . '/master-bin.000003';
2424
$binlog_exists= 0;
2525
while ($timeout > 0 && $binlog_exists == 0)
2626
{

0 commit comments

Comments
 (0)