bzr commit into mysql-5.1 branch (jonas:2711)

[jonas]

#At file:///home/jonas/src/telco-6.4/

 2711 jonas@stripped	2008-08-12 [merge]
      merge 6.3 to 6.4
modified:
  mysql-test/suite/rpl_ndb/t/rpl_ndb_logging.test

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_logging.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_logging.test	2007-09-05 16:06:44 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_logging.test	2008-08-12 15:04:32 +0000
@@ -3,7 +3,7 @@
 #
 --source include/have_ndb.inc
 --source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
 
 --disable_warnings
 --disable_query_log