diff options
| author | unknown <lars/lthalmann@mysql.com/dl145k.mysql.com> | 2007-05-30 15:56:05 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@mysql.com/dl145k.mysql.com> | 2007-05-30 15:56:05 +0200 |
| commit | 647923f9e99248e87f1723304b5e6c986f6d4737 (patch) | |
| tree | 9b808e86d9e193b2fb822b4cc8886df73362f548 | |
| parent | d57f3bbbe1073cb0f3c72a00539bc60c96739b17 (diff) | |
| download | mariadb-git-647923f9e99248e87f1723304b5e6c986f6d4737.tar.gz | |
Masking out error that is not generated by the test (rpl_ndb_basic.test) itself
mysql-test/r/rpl_ndb_basic.result:
Masking out error that is not generated by the test itself
mysql-test/t/rpl_ndb_basic.test:
Masking out error that is not generated by the test itself
| -rw-r--r-- | mysql-test/r/rpl_ndb_basic.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/rpl_ndb_basic.test | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/rpl_ndb_basic.result b/mysql-test/r/rpl_ndb_basic.result index 4dab05b31de..37217bf0ad1 100644 --- a/mysql-test/r/rpl_ndb_basic.result +++ b/mysql-test/r/rpl_ndb_basic.result @@ -159,8 +159,8 @@ Replicate_Do_Table Replicate_Ignore_Table <Replicate_Ignore_Table> Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table -Last_Errno 1105 -Last_Error Unknown error +Last_Errno <Last_Errno> +Last_Error <Last_Error> Skip_Counter 0 Exec_Master_Log_Pos <Exec_Master_Log_Pos> Relay_Log_Space <Relay_Log_Space> diff --git a/mysql-test/t/rpl_ndb_basic.test b/mysql-test/t/rpl_ndb_basic.test index 04c855f8730..e485b1d1bde 100644 --- a/mysql-test/t/rpl_ndb_basic.test +++ b/mysql-test/t/rpl_ndb_basic.test @@ -197,7 +197,7 @@ UPDATE t1 SET `nom`="DEAD" WHERE `nid`=1; --connection slave --echo **** On Slave **** --replace_result $MASTER_MYPORT MASTER_PORT ---replace_column 1 <Slave_IO_State> 7 <Read_Master_Log_Pos> 8 <Relay_Log_File> 9 <Relay_Log_Pos> 16 <Replicate_Ignore_Table> 22 <Exec_Master_Log_Pos> 23 <Relay_Log_Space> 33 <Seconds_Behind_Master> +--replace_column 1 <Slave_IO_State> 7 <Read_Master_Log_Pos> 8 <Relay_Log_File> 9 <Relay_Log_Pos> 16 <Replicate_Ignore_Table> 19 <Last_Errno> 20 <Last_Error> 22 <Exec_Master_Log_Pos> 23 <Relay_Log_Space> 33 <Seconds_Behind_Master> --query_vertical SHOW SLAVE STATUS; # now set max retries high enough to succeed, and start slave again |