diff options
| author | unknown <tulin@dl145c.mysql.com> | 2005-09-12 14:11:28 +0200 |
|---|---|---|
| committer | unknown <tulin@dl145c.mysql.com> | 2005-09-12 14:11:28 +0200 |
| commit | 4efcca023b47e9d8fff148da2c65254ddbee6c9b (patch) | |
| tree | 3277672a0e0bb82fb801050c58afbe0ef04aef26 /mysql-test | |
| parent | 2eb6b134a6e95ca354e7fa124d863b41e7a89976 (diff) | |
| parent | 0a3202bedfbe3666e29690b12ce94123e73f8945 (diff) | |
| download | mariadb-git-4efcca023b47e9d8fff148da2c65254ddbee6c9b.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
mysql-test/t/rpl_slave_status.test:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/rpl_slave_status.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl_slave_status.test | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/r/rpl_slave_status.result b/mysql-test/r/rpl_slave_status.result index 8badbab85ff..2146132aeb0 100644 --- a/mysql-test/r/rpl_slave_status.result +++ b/mysql-test/r/rpl_slave_status.result @@ -19,7 +19,7 @@ flush privileges; stop slave; start slave; show slave status; -Slave_IO_State Connecting to master +Slave_IO_State # Master_Host 127.0.0.1 Master_User rpl Master_Port MASTER_MYPORT diff --git a/mysql-test/t/rpl_slave_status.test b/mysql-test/t/rpl_slave_status.test index 2c5bd2bffb0..67d3816f443 100644 --- a/mysql-test/t/rpl_slave_status.test +++ b/mysql-test/t/rpl_slave_status.test @@ -23,7 +23,9 @@ connection slave; stop slave; start slave; --replace_result $MASTER_MYPORT MASTER_MYPORT ---replace_column 7 # 8 # 9 # 22 # 23 # +# Column 1 is replaced, since the output can be either +# "Connecting to master" or "Waiting for master update" +--replace_column 1 # 7 # 8 # 9 # 22 # 23 # --vertical_results show slave status; |