into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl


mysql-test/r/rpl_ndb_basic.result:
  Auto merged
sql/mysqld.cc:
  Auto merged