bzr commit into mysql-6.0 branch (aelkin:2674) Bug#25998

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/FIXES/6.0-rpl-bug25998-cirl_repl_term/

 2674 Andrei Elkin	2008-07-18
      bug#25998 
      
      updating results
modified:
  mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result

per-file messages:
  mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result
    results changed
=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result	2008-06-10 22:27:52 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result	2008-07-18 16:14:18 +0000
@@ -304,6 +304,8 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	0
 Last_SQL_Error	
+Replicate_Ignore_Server_Ids	
+Master_Server_Id	1
 show binlog events in 'slave-bin.000005' from 4;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
 DROP TABLE t1;