diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-03-03 11:17:00 +0100 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-03-03 11:17:00 +0100 |
| commit | 1a6a540286e4a35e647a6802449d0e10baf2d90f (patch) | |
| tree | 72846b722404a3b8e7ff70402a02a2964480442c /mysql-test/t/mysqltest.test | |
| parent | 4760adbf3f8e283cb83912bc51d79d531787f0ba (diff) | |
| download | mariadb-git-1a6a540286e4a35e647a6802449d0e10baf2d90f.tar.gz | |
followup test fix after 49761
Diffstat (limited to 'mysql-test/t/mysqltest.test')
| -rw-r--r-- | mysql-test/t/mysqltest.test | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index b2d7c59a8a0..0c31af8b641 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -1728,7 +1728,16 @@ select 1; --reap EOF --error 1 ---exec $MYSQL_TEST < $MYSQLTEST_VARDIR/tmp/mysqltest.in 2>&1 +# Must filter unpredictable extra warning from output +--exec $MYSQL_TEST < $MYSQLTEST_VARDIR/tmp/mysqltest.in > $MYSQL_TMP_DIR/mysqltest.out 2>&1 +--perl + my $dir= $ENV{'MYSQL_TMP_DIR'}; + open (FILE, "$dir/mysqltest.out"); + while (<FILE>) { + print unless /Note: net_clear/; # This shows up on rare occations + } +EOF +remove_file $MYSQL_TMP_DIR/mysqltest.out; remove_file $MYSQLTEST_VARDIR/tmp/mysqltest.in; drop table t1; |