bk commit into 5.1 tree (lars:1.2525)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.1 repository of lthalmann. When lthalmann does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-05-30 15:56:05+02:00, lars@stripped +2 -0
  Masking out error that is not generated by the test (rpl_ndb_basic.test) itself

  mysql-test/r/rpl_ndb_basic.result@stripped, 2007-05-30 15:56:02+02:00, lars@stripped +2 -2
    Masking out error that is not generated by the test itself

  mysql-test/t/rpl_ndb_basic.test@stripped, 2007-05-30 15:56:02+02:00, lars@stripped +1 -1
    Masking out error that is not generated by the test itself

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lars
# Host:	dl145k.mysql.com
# Root:	/nfsdisk1/lars/bk/mysql-5.1-new-rpl

--- 1.10/mysql-test/r/rpl_ndb_basic.result	2007-05-30 15:56:13 +02:00
+++ 1.11/mysql-test/r/rpl_ndb_basic.result	2007-05-30 15:56:13 +02:00
@@ -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>

--- 1.10/mysql-test/t/rpl_ndb_basic.test	2007-05-30 15:56:13 +02:00
+++ 1.11/mysql-test/t/rpl_ndb_basic.test	2007-05-30 15:56:13 +02:00
@@ -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