Masking out error that is not generated by the test (rpl_ndb_basic.test) itself

ac1d6a7f · lars/lthalmann@mysql.com/dl145k.mysql.com · a6cf35bb · ac1d6a7f · ac1d6a7f
Commit ac1d6a7f authored May 30, 2007 by lars/lthalmann@mysql.com/dl145k.mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

mysql-test/r/rpl_ndb_basic.result mysql-test/r/rpl_ndb_basic.result +2 -2

mysql-test/t/rpl_ndb_basic.test mysql-test/t/rpl_ndb_basic.test +1 -1

No files found.
--- 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>

--- 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