From 3c310141bac0f9750b3dbcf34bb855ffd809f01d Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 14 Feb 2006 10:46:46 -0800 Subject: [PATCH] Added --silent option andd just test results via select. This will keep down the appearance of non deterministic responses. This is for bug#17384 mysql-test/r/mysqldump.result: Changed result mysql-test/t/disabled.def: Re-enable after fixing bugs mysql-test/t/mysqldump.test: Added silent option --- mysql-test/r/mysqldump.result | 2 -- mysql-test/t/disabled.def | 1 - mysql-test/t/mysqldump.test | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index 7328a7da2eb..029f7c8d876 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -2666,8 +2666,6 @@ We the people in order to perform a more perfect union test.t1: Records: 2 Deleted: 0 Skipped: 0 Warnings: 0 test.t2: Records: 2 Deleted: 0 Skipped: 0 Warnings: 0 -test.t1: Records: 2 Deleted: 0 Skipped: 0 Warnings: 0 -test.t2: Records: 2 Deleted: 0 Skipped: 0 Warnings: 0 select * from t1; a b Duck, Duck goose diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index b8646f61b87..c062aec5a4a 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -39,4 +39,3 @@ binlog_row_insert_select : Bug #17385 rpl_row_basic_2myisam : Bug #17385 rpl_row_basic_3innodb : Bug #17385 rpl_row_create_table : Bug #17385 -mysqldump : Bug #17383 Bug #17384 diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index dea8e32869e..3f2fa8e8bf2 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -1066,7 +1066,7 @@ select * from t2; # The first load tests the pausing code --exec $MYSQL_IMPORT --use-threads=1 test $MYSQLTEST_VARDIR/tmp/t1.txt $MYSQLTEST_VARDIR/tmp/t2.txt # Now we test with multiple threads! ---exec $MYSQL_IMPORT --use-threads=5 test $MYSQLTEST_VARDIR/tmp/t1.txt $MYSQLTEST_VARDIR/tmp/t2.txt +--exec $MYSQL_IMPORT --silent --use-threads=5 test $MYSQLTEST_VARDIR/tmp/t1.txt $MYSQLTEST_VARDIR/tmp/t2.txt select * from t1; select * from t2;