-
unknown authored
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new mysql-test/r/rpl_ndb_sync.result: manual merge mysql-test/t/disabled.def: SCCS merged mysql-test/t/rpl_ndb_sync.test: manual merge
46e4eabf
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new mysql-test/r/rpl_ndb_sync.result: manual merge mysql-test/t/disabled.def: SCCS merged mysql-test/t/rpl_ndb_sync.test: manual merge