From 9e013ec2d1ec656117fa257f20df5558f3ce8ba9 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 9 Dec 2005 14:38:35 +0100 Subject: Attempt to fix rpl_relayrotate.test for host openbsd, fix suggested by Guilhem --- mysql-test/t/rpl_relayrotate.test | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'mysql-test') diff --git a/mysql-test/t/rpl_relayrotate.test b/mysql-test/t/rpl_relayrotate.test index e9a4cdd05c5..04f03367e20 100644 --- a/mysql-test/t/rpl_relayrotate.test +++ b/mysql-test/t/rpl_relayrotate.test @@ -52,9 +52,8 @@ start slave; # which proves that the transaction restarted at # the right place. # We must wait for the transaction to commit before -# reading, MASTER_POS_WAIT() will do it for sure -# (the only statement with position>=3000 is COMMIT). -select master_pos_wait('master-bin.001',3000)>=0; +# reading: +sync_with_master; select max(a) from t1; connection master; -- cgit v1.2.1 From 72d328d96cd8f53f8f4be7bc76be0d117b051b19 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 9 Dec 2005 15:28:20 +0100 Subject: trigger-grant.test, trigger-compat.test: Removed --text from grep, not portable mysql-test/t/trigger-compat.test: Removed --text from grep, not portable mysql-test/t/trigger-grant.test: Removed --text from grep, not portable --- mysql-test/t/trigger-compat.test | 2 +- mysql-test/t/trigger-grant.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'mysql-test') diff --git a/mysql-test/t/trigger-compat.test b/mysql-test/t/trigger-compat.test index ace18639172..c2acc235135 100644 --- a/mysql-test/t/trigger-compat.test +++ b/mysql-test/t/trigger-compat.test @@ -61,7 +61,7 @@ CREATE TRIGGER wl2818_trg1 BEFORE INSERT ON t1 --echo --echo ---> patching t1.TRG... ---exec grep --text -v 'definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG +--exec grep -v 'definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG --exec mv $MYSQL_TEST_DIR/var/tmp/t1.TRG $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG # diff --git a/mysql-test/t/trigger-grant.test b/mysql-test/t/trigger-grant.test index c058816ee75..deeaeacbccc 100644 --- a/mysql-test/t/trigger-grant.test +++ b/mysql-test/t/trigger-grant.test @@ -449,7 +449,7 @@ CREATE TRIGGER trg5 BEFORE DELETE ON t1 FOR EACH ROW SET @a = 5; ---exec egrep --text -v '^definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG +--exec egrep -v '^definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG --exec echo "definers='' '@' '@abc@def@@' '@hostname' '@abcdef@@@hostname'" >> $MYSQL_TEST_DIR/var/tmp/t1.TRG --exec mv $MYSQL_TEST_DIR/var/tmp/t1.TRG $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG -- cgit v1.2.1 From 92c77183d90cd140d61a2c961e5fcaac08c6b2c8 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 9 Dec 2005 20:18:25 +0400 Subject: Fix for bug #15605: 5.0.17 test case 'mysqltest' failure. mysql-test/t/mysqltest.test: Fix for bug #15605: 5.0.17 test case 'mysqltest' failure. - use 'test -s' instead of 'cat' to get assured 1 (cat returns >0 in case of errors) --- mysql-test/t/mysqltest.test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mysql-test') diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index 8ccf2cb0c7a..440a7787985 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -968,9 +968,9 @@ drop table t1; --error 1 --exec $MYSQL_TEST --record -x $MYSQL_TEST_DIR/var/tmp/bug11731.sql -R $MYSQL_TEST_DIR/var/tmp/bug11731.out -# The .out file should be empty, cat will fail! +# The .out file should be empty --error 1 ---exec cat $MYSQL_TEST_DIR/var/tmp/bug11731.out +--exec test -s $MYSQL_TEST_DIR/var/tmp/bug11731.out drop table t1; -- cgit v1.2.1 From d96d3fbac8794d39ed47e896e2ba89bbca98a43c Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 12 Dec 2005 16:58:20 +0100 Subject: skip_name_resolve.result, skip_name_resolve.test: Ignore columns with unpredictable values. rpl_relayrotate.result: Changed result file to match change in test mysql-test/r/rpl_relayrotate.result: Changed result file to match change in test mysql-test/t/skip_name_resolve.test: Ignore columns with unpredictable values. mysql-test/r/skip_name_resolve.result: Ignore columns with unpredictable values. --- mysql-test/r/rpl_relayrotate.result | 3 --- mysql-test/r/skip_name_resolve.result | 4 ++-- mysql-test/t/skip_name_resolve.test | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'mysql-test') diff --git a/mysql-test/r/rpl_relayrotate.result b/mysql-test/r/rpl_relayrotate.result index b038e7b6a3e..20f19973d83 100644 --- a/mysql-test/r/rpl_relayrotate.result +++ b/mysql-test/r/rpl_relayrotate.result @@ -10,9 +10,6 @@ reset slave; start slave; stop slave; start slave; -select master_pos_wait('master-bin.001',3000)>=0; -master_pos_wait('master-bin.001',3000)>=0 -1 select max(a) from t1; max(a) 8000 diff --git a/mysql-test/r/skip_name_resolve.result b/mysql-test/r/skip_name_resolve.result index a969c5c9ae0..8ef52e75238 100644 --- a/mysql-test/r/skip_name_resolve.result +++ b/mysql-test/r/skip_name_resolve.result @@ -10,5 +10,5 @@ user() # show processlist; Id User Host db Command Time State Info -# root # test Sleep # NULL -# root # test Query # NULL show processlist + root test