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