diff options
| author | unknown <kent@mysql.com> | 2005-12-12 16:58:20 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-12-12 16:58:20 +0100 |
| commit | d96d3fbac8794d39ed47e896e2ba89bbca98a43c (patch) | |
| tree | 66dfa3867b6ce822eb2d4c902ee793f94e080f39 /mysql-test | |
| parent | c897e2156346b6df464d856fd6433c55a202aa9b (diff) | |
| download | mariadb-git-d96d3fbac8794d39ed47e896e2ba89bbca98a43c.tar.gz | |
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.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/rpl_relayrotate.result | 3 | ||||
| -rw-r--r-- | mysql-test/r/skip_name_resolve.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/skip_name_resolve.test | 2 |
3 files changed, 3 insertions, 6 deletions
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 +<id> root <host> test <command> <time> <state> <info> +<id> root <host> test <command> <time> <state> <info> diff --git a/mysql-test/t/skip_name_resolve.test b/mysql-test/t/skip_name_resolve.test index b67869692d2..3f732c8912b 100644 --- a/mysql-test/t/skip_name_resolve.test +++ b/mysql-test/t/skip_name_resolve.test @@ -15,6 +15,6 @@ DROP USER mysqltest_1@'127.0.0.1/255.255.255.255'; connect (con1, 127.0.0.1, root, , test, $MASTER_MYPORT, ); --replace_column 1 # select user(); ---replace_column 1 # 6 # 3 # +--replace_column 1 <id> 3 <host> 5 <command> 6 <time> 7 <state> 8 <info> show processlist; connection default; |