List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:May 13 2011 7:42am
Subject:bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4350)
View as plain text  
#At file:///data0/magnus/mysql/7.0-split-rpl_ndb/ based on revid:magnus.blaudd@strippedefgz3ct

 4350 Magnus Blåudd	2011-05-13
      ndb
        - move all replication tests that are unique to ndb into ndb_rpl and
          keep only the tests that source from extra/rpl_tests/ still in rpl_ndb

    added:
      mysql-test/suite/ndb_rpl/
      mysql-test/suite/ndb_rpl/my.cnf
      mysql-test/suite/ndb_rpl/r/
      mysql-test/suite/ndb_rpl/t/
      mysql-test/suite/ndb_rpl/t/disabled.def
    renamed:
      mysql-test/suite/rpl_ndb/ndb_master-slave.inc => mysql-test/suite/ndb_rpl/ndb_master-slave.inc
      mysql-test/suite/rpl_ndb/ndb_master-slave_2ch.inc => mysql-test/suite/ndb_rpl/ndb_master-slave_2ch.inc
      mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_2innodb.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_2myisam.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_2ndb.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_2ndb.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_2other.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_2other.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_add_column.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_add_column.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_apply_status.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_apply_status.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_auto_inc.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_auto_inc.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_bank.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_bank.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_basic.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_bitfield.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_bitfield.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_blob.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_blob.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_break_3_chain.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_break_3_chain.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_bug22045.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_bug22045.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_check_for_mixed.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_check_for_mixed.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_circular.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_2ch.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_simplex.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_conflict.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_conflict_max.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_max.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_conflict_max_delete_win.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_max_delete_win.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_conflict_old.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_old.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_ctype_ucs2_def.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_advance.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_basic.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_basic.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_partitions.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_do_db.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_do_db.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_do_table.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_do_table.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_empty_epoch.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_empty_epoch.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_gap_event.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_gap_event.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_idempotent.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_ignore_db.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_ignore_db.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb2ndb.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_innodb2ndb.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb_trans.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_innodb_trans.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_load.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_load.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_logging.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_logging.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_mix_eng_trans.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_mix_eng_trans.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_mix_innodb.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_mix_innodb.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_tables.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_mixed_tables.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_multi.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_myisam2ndb.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_error.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_rep_error.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_ignore.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_rep_ignore.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_skip_gap_event.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_skip_gap_event.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_slave_lsu.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_slave_lsu.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_slave_lsu_anyval.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_slave_lsu_anyval.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_slave_restart.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_slave_restart.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_stm_innodb.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_sync.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_ui.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_ui.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_ui2.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_ui2.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_ui3.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_ui3.result
      mysql-test/suite/rpl_ndb/r/rpl_ndbapi_multi.result => mysql-test/suite/ndb_rpl/r/ndb_rpl_ndbapi_multi.result
      mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result => mysql-test/suite/rpl_ndb/r/rpl_ndb_row_basic.result
      mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result => mysql-test/suite/ndb_rpl/r/rpl_truncate_7ndb.result
      mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result => mysql-test/suite/ndb_rpl/r/rpl_truncate_7ndb_2.result
      mysql-test/suite/rpl_ndb/t/ndb_apply_status.frm => mysql-test/suite/ndb_rpl/t/ndb_apply_status.frm
      mysql-test/suite/rpl_ndb/t/ndb_conflict_info.inc => mysql-test/suite/ndb_rpl/t/ndb_conflict_info.inc
      mysql-test/suite/rpl_ndb/t/ndb_conflict_info_init.inc => mysql-test/suite/ndb_rpl/t/ndb_conflict_info_init.inc
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_2innodb-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_2innodb-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_2innodb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2multi_basic.inc => mysql-test/suite/ndb_rpl/t/ndb_rpl_2multi_basic.inc
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2multi_eng.inc => mysql-test/suite/ndb_rpl/t/ndb_rpl_2multi_eng.inc
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_2myisam-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_2myisam-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_2myisam.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_2ndb-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_2ndb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_2other-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_2other.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_add_column.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_add_column.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_apply_status-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_apply_status.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_auto_inc.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_auto_inc.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_bank.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_basic.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_bitfield.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_bitfield.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_blob.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_break_3_chain.cnf => mysql-test/suite/ndb_rpl/t/ndb_rpl_break_3_chain.cnf
      mysql-test/suite/rpl_ndb/t/rpl_ndb_break_3_chain.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_break_3_chain.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_bug22045.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_bug22045.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_check_for_mixed.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_check_for_mixed.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_circular.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf => mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch.cnf
      mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_simplex.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_1.inc => mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_1.inc
      mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_max-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_max-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_max.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_max.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_max_delete_win-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_max_delete_win-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_max_delete_win.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_max_delete_win.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_old-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_old-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_old.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_old.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_ctype_ucs2_def-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_ctype_ucs2_def.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_dd_advance.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_basic.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_dd_basic.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_dd_partitions-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_dd_partitions-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_dd_partitions.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_do_db-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_do_db.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_do_table-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_do_table.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_empty_epoch.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_empty_epoch.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_gap_event-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_gap_event-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_gap_event.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_gap_event.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_get_binlog_events.inc => mysql-test/suite/ndb_rpl/t/ndb_rpl_get_binlog_events.inc
      mysql-test/suite/rpl_ndb/t/rpl_ndb_idempotent.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_idempotent.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_ignore_db-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_ignore_db-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_ignore_db.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_ignore_db.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb2ndb-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb2ndb-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb2ndb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb_trans-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb_trans.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_load.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_load.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_logging.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_logging.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_eng_trans-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_mix_eng_trans-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_eng_trans-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_mix_eng_trans-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_eng_trans.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_mix_eng_trans.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_mix_innodb-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_mix_innodb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_mixed_tables-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_mixed_tables-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_mixed_tables.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_multi.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_binlog_update.cnf => mysql-test/suite/ndb_rpl/t/ndb_rpl_multi_binlog_update.cnf
      mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_binlog_update.inc => mysql-test/suite/ndb_rpl/t/ndb_rpl_multi_binlog_update.inc
      mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_multi_update2-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_myisam2ndb-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_myisam2ndb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_relayrotate-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_error.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_rep_error.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_rep_ignore-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_rep_ignore.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_skip_gap_event-slave.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_skip_gap_event-slave.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_skip_gap_event.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_skip_gap_event.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_slave_lsu.cnf => mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_lsu.cnf
      mysql-test/suite/rpl_ndb/t/rpl_ndb_slave_lsu.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_lsu.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_slave_lsu_anyval.cnf => mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_lsu_anyval.cnf
      mysql-test/suite/rpl_ndb/t/rpl_ndb_slave_lsu_anyval.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_lsu_anyval.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_slave_restart.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_restart.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-master.opt => mysql-test/suite/ndb_rpl/t/ndb_rpl_stm_innodb-master.opt
      mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_stm_innodb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_sync.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_ui.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_ui.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_ui2.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_ui2.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_ui3.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_ui3.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_wait_schema_logging.inc => mysql-test/suite/ndb_rpl/t/wait_schema_logging.inc
      mysql-test/suite/rpl_ndb/t/rpl_ndb_xxx_innodb.inc => mysql-test/suite/ndb_rpl/t/ndb_rpl_xxx_innodb.inc
      mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test => mysql-test/suite/ndb_rpl/t/ndb_rpl_ndbapi_multi.test
      mysql-test/suite/rpl_ndb/t/rpl_row_basic_7ndb.test => mysql-test/suite/rpl_ndb/t/rpl_ndb_row_basic.test
      mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb.test => mysql-test/suite/ndb_rpl/t/rpl_truncate_7ndb.test
      mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test => mysql-test/suite/ndb_rpl/t/rpl_truncate_7ndb_2.test
      mysql-test/suite/rpl_ndb/t/select_ndb_apply_status.inc => mysql-test/suite/ndb_rpl/t/select_ndb_apply_status.inc
    modified:
      mysql-test/mysql-test-run.pl
      mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.test
      mysql-test/suite/rpl_ndb/t/disabled.def
      mysql-test/suite/rpl_ndb/t/rpl_ndb_UUID.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_blob2.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_delete_nowhere.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_extra_col_master.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_extra_col_slave.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_func003.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_insert_ignore.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update3.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_row_001.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_set_null.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_sp003.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_sp006.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_trig004.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_all.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_lossy.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_nonlossy.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_strict.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_2innodb.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_2myisam.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_2ndb.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_2other.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_add_column.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_apply_status.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_auto_inc.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_bank.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_basic.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_bitfield.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_blob.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_bug22045.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_check_for_mixed.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_simplex.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_1.inc
      mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_max.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_max_delete_win.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_old.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_ctype_ucs2_def.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_dd_advance.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_dd_basic.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_dd_partitions.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_do_db.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_do_table.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_empty_epoch.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_gap_event.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_idempotent.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_ignore_db.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb2ndb.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb_trans.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_load.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_logging.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_mix_eng_trans.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_mix_innodb.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_mixed_tables.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_multi_binlog_update.inc
      mysql-test/suite/ndb_rpl/t/ndb_rpl_myisam2ndb.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_rep_error.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_rep_ignore.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_skip_gap_event.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_lsu.cnf
      mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_lsu.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_lsu_anyval.cnf
      mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_lsu_anyval.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_restart.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_stm_innodb.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_sync.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_ui.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_ui2.test
      mysql-test/suite/ndb_rpl/t/ndb_rpl_ui3.test
      mysql-test/suite/ndb_rpl/t/wait_schema_logging.inc
      mysql-test/suite/ndb_rpl/t/ndb_rpl_xxx_innodb.inc
      mysql-test/suite/ndb_rpl/t/ndb_rpl_ndbapi_multi.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_row_basic.test
      mysql-test/suite/ndb_rpl/t/rpl_truncate_7ndb.test
      mysql-test/suite/ndb_rpl/t/rpl_truncate_7ndb_2.test
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-04-27 06:52:34 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-05-13 07:40:50 +0000
@@ -158,7 +158,7 @@ my $path_config_file;           # The ge
 # executables will be used by the test suite.
 our $opt_vs_config = $ENV{'MTR_VS_CONFIG'};
 
-my $DEFAULT_SUITES= "ndb,ndb_binlog,rpl_ndb,main,binlog,federated,rpl,innodb,ndb_team";
+my $DEFAULT_SUITES= "ndb,ndb_binlog,rpl_ndb,ndb_rpl,main,binlog,federated,rpl,innodb,ndb_team";
 my $opt_suites;
 my $opt_extra_suites;
 

=== modified file 'mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.test'
--- a/mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.test	2010-12-14 19:28:08 +0000
+++ b/mysql-test/suite/ndb_binlog/t/ndb_binlog_variants.test	2011-05-13 07:40:50 +0000
@@ -35,15 +35,15 @@ create table ba(ks int primary key, st i
 # Wait for each mysqld to startup binlogging
 --let $source_server=mysqld1
 --let $dest_server=mysqld2
-source suite/rpl_ndb/t/rpl_ndb_wait_schema_logging.inc;
+source suite/ndb_rpl/t/wait_schema_logging.inc;
 
 --let $source_server=mysqld1
 --let $dest_server=mysqld3
-source suite/rpl_ndb/t/rpl_ndb_wait_schema_logging.inc;
+source suite/ndb_rpl/t/wait_schema_logging.inc;
 
 --let $source_server=mysqld1
 --let $dest_server=mysqld4
-source suite/rpl_ndb/t/rpl_ndb_wait_schema_logging.inc;
+source suite/ndb_rpl/t/wait_schema_logging.inc;
 
 --disable_query_log
 connection mysqld1;

=== added directory 'mysql-test/suite/ndb_rpl'
=== added file 'mysql-test/suite/ndb_rpl/my.cnf'
--- a/mysql-test/suite/ndb_rpl/my.cnf	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb_rpl/my.cnf	2011-05-13 07:40:50 +0000
@@ -0,0 +1,97 @@
+!include include/default_mysqld.cnf
+!include include/default_ndbd.cnf
+
+[cluster_config]
+TimeBetweenEpochsTimeout = 30000
+
+[cluster_config.1]
+NoOfReplicas=                  2
+ndbd=,
+ndb_mgmd=
+mysqld=,
+ndbapi=,,,,,,,,,
+
+[cluster_config.slave]
+NoOfReplicas=                  1
+ndbd=
+ndb_mgmd=
+mysqld=
+ndbapi=,,,,
+
+[mysqld]
+# Make all mysqlds use cluster
+ndbcluster
+ndb-wait-connected=20
+ndb-wait-setup=120
+ndb-cluster-connection-pool=3
+slave-allow-batching
+ndb-log-orig
+# Turn on bin logging
+log-bin=                       master-bin
+# for performance reasons
+ndb-table-temporary=1
+
+ndb-extra-logging=99
+# Cluster only supports row format
+binlog-format=                 row
+
+[mysqld.1.1]
+
+[mysqld.1.1]
+
+[mysqld.1.slave]
+
+# Append <testname>-slave.opt file to the list of argument used when
+# starting the mysqld
+#!use-slave-opt
+
+# Connect mysqld in the second cluster as save to  first mysqld
+# Hardcode the host to 127.0.0.1 until running on more
+# than one host and it probably need to be masked anyway
+# master-host=                @mysqld.1.#host
+master-host=                  127.0.0.1
+master-port=                  @mysqld.1.1.port
+master-password=              @mysqld.1.1.#password
+master-user=                  @mysqld.1.1.#user
+master-connect-retry=         1
+
+log-bin=                      slave-bin
+relay-log=                    slave-relay-bin
+# Cluster only supports row format
+binlog-format=                 row
+
+init-rpl-role=                slave
+log-slave-updates
+master-retry-count=           10
+
+# Values reported by slave when it connect to master
+# and shows up in SHOW SLAVE STATUS;
+report-host=                  127.0.0.1
+report-port=                  @mysqld.1.slave.port
+report-user=                  root
+
+# Configure slave mysqld without innodb, and set myisam
+# as default storage engine(since innodb will be default
+# otherwise starting  from 5.5)
+loose-skip-innodb
+default-storage-engine=myisam
+
+skip-slave-start
+
+# Directory where slaves find the dumps generated by "load data"
+# on the server. The path need to have constant length otherwise
+# test results will vary, thus a relative path is used.
+slave-load-tmpdir=            ../../../tmp
+
+rpl-recovery-rank=            @mysqld.1.slave.server-id
+
+[ENV]
+NDB_CONNECTSTRING=            @mysql_cluster.1.ndb_connectstring
+MASTER_MYPORT=                @mysqld.1.1.port
+MASTER_MYPORT1=               @mysqld.2.1.port
+
+NDB_CONNECTSTRING_SLAVE=      @mysql_cluster.slave.ndb_connectstring
+SLAVE_MYPORT=                 @mysqld.1.slave.port
+SLAVE_MYSOCK=                 @mysqld.1.slave.socket
+
+NDB_BACKUP_DIR=               @cluster_config.ndbd.1.1.BackupDataDir

=== renamed file 'mysql-test/suite/rpl_ndb/ndb_master-slave.inc' => 'mysql-test/suite/ndb_rpl/ndb_master-slave.inc'
=== renamed file 'mysql-test/suite/rpl_ndb/ndb_master-slave_2ch.inc' => 'mysql-test/suite/ndb_rpl/ndb_master-slave_2ch.inc'
=== added directory 'mysql-test/suite/ndb_rpl/r'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_2innodb.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_2innodb.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_2myisam.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_2myisam.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_2ndb.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_2ndb.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_2other.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_2other.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_add_column.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_add_column.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_apply_status.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_apply_status.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_auto_inc.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_auto_inc.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_bank.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_bank.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_basic.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_bitfield.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_bitfield.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_blob.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_blob.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_break_3_chain.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_break_3_chain.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_bug22045.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_bug22045.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_check_for_mixed.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_check_for_mixed.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_circular.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_2ch.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_simplex.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_conflict.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_conflict_max.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_max.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_conflict_max_delete_win.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_max_delete_win.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_conflict_old.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_old.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_ctype_ucs2_def.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_advance.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_basic.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_basic.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_partitions.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_partitions.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_do_db.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_do_db.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_do_table.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_do_table.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_empty_epoch.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_empty_epoch.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_gap_event.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_gap_event.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_idempotent.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_ignore_db.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_ignore_db.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb2ndb.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_innodb2ndb.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb_trans.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_innodb_trans.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_load.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_load.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_logging.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_logging.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_mix_eng_trans.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_mix_eng_trans.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_mix_innodb.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_mix_innodb.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_tables.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_mixed_tables.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_multi.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_myisam2ndb.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndbapi_multi.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_ndbapi_multi.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_error.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_rep_error.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_rep_ignore.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_rep_ignore.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_skip_gap_event.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_skip_gap_event.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_slave_lsu.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_slave_lsu.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_slave_lsu_anyval.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_slave_lsu_anyval.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_slave_restart.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_slave_restart.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_stm_innodb.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_sync.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_ui.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_ui.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_ui2.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_ui2.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_ui3.result' => 'mysql-test/suite/ndb_rpl/r/ndb_rpl_ui3.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result' => 'mysql-test/suite/ndb_rpl/r/rpl_truncate_7ndb.result'
=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result' => 'mysql-test/suite/ndb_rpl/r/rpl_truncate_7ndb_2.result'
=== added directory 'mysql-test/suite/ndb_rpl/t'
=== added file 'mysql-test/suite/ndb_rpl/t/disabled.def'
--- a/mysql-test/suite/ndb_rpl/t/disabled.def	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/ndb_rpl/t/disabled.def	2011-05-13 07:40:50 +0000
@@ -0,0 +1,13 @@
+##############################################################################
+#
+#  List the test cases that are to be disabled temporarily.
+#
+#  Separate the test case name and the comment with ':'.
+#
+#    <testcasename> : BUG#<xxxx> <date disabled> <disabler> <comment>
+#
+#  Do not use any TAB characters for whitespace.
+#
+##############################################################################
+
+ndb_rpl_ctype_ucs2_def : bug #34661 rpl_ndb_ctype_ucs2_def fails in 6.2

=== renamed file 'mysql-test/suite/rpl_ndb/t/ndb_apply_status.frm' => 'mysql-test/suite/ndb_rpl/t/ndb_apply_status.frm'
=== renamed file 'mysql-test/suite/rpl_ndb/t/ndb_conflict_info.inc' => 'mysql-test/suite/ndb_rpl/t/ndb_conflict_info.inc'
=== renamed file 'mysql-test/suite/rpl_ndb/t/ndb_conflict_info_init.inc' => 'mysql-test/suite/ndb_rpl/t/ndb_conflict_info_init.inc'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-master.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_2innodb-master.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb-slave.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_2innodb-slave.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_2innodb.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test	2011-04-20 11:50:29 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_2innodb.test	2011-05-13 07:40:50 +0000
@@ -42,7 +42,7 @@ set new=on;
 set storage_engine=ndbcluster;
 --enable_query_log
 
---source suite/rpl_ndb/t/rpl_ndb_2multi_eng.inc
+--source suite/ndb_rpl/t/ndb_rpl_2multi_eng.inc
 
 --connection slave
 set @@global.slave_exec_mode= 'STRICT';

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_2multi_basic.inc' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_2multi_basic.inc'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_2multi_eng.inc' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_2multi_eng.inc'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-master.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_2myisam-master.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam-slave.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_2myisam-slave.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_2myisam.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test	2011-04-20 11:50:29 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_2myisam.test	2011-05-13 07:40:50 +0000
@@ -41,7 +41,7 @@ set new=on;
 set storage_engine=ndbcluster;
 --enable_query_log
 
---source suite/rpl_ndb/t/rpl_ndb_2multi_eng.inc
+--source suite/ndb_rpl/t/ndb_rpl_2multi_eng.inc
 
 --connection slave
 set @@global.slave_exec_mode= 'STRICT';

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb-slave.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_2ndb-slave.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_2ndb.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test	2011-04-20 12:10:50 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_2ndb.test	2011-05-13 07:40:50 +0000
@@ -6,7 +6,7 @@
 ##############################################################
 --source include/have_binlog_format_mixed_or_row.inc
 --source include/have_ndb.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 # On master use NDB as storage engine.
 connection master;
@@ -16,5 +16,5 @@ SET storage_engine=ndb;
 --echo === NDB -> NDB ===
 --echo
 connection slave;
---source suite/rpl_ndb/t/rpl_ndb_2multi_basic.inc
+--source suite/ndb_rpl/t/ndb_rpl_2multi_basic.inc
 --source include/rpl_end.inc

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_2other-slave.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_2other.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test	2011-04-20 14:36:44 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_2other.test	2011-05-13 07:40:50 +0000
@@ -41,7 +41,7 @@ SET @old_slave_storage_engine=@@global.s
 SET @@global.storage_engine=myisam;
 
 --source include/start_slave.inc
---source suite/rpl_ndb/t/rpl_ndb_2multi_basic.inc
+--source suite/ndb_rpl/t/ndb_rpl_2multi_basic.inc
 --source include/rpl_connection_slave.inc
 --source include/stop_slave.inc
 
@@ -56,7 +56,7 @@ alter table mysql.ndb_apply_status engin
 SET @@global.storage_engine=innodb;
 
 --source include/start_slave.inc
---source suite/rpl_ndb/t/rpl_ndb_2multi_basic.inc
+--source suite/ndb_rpl/t/ndb_rpl_2multi_basic.inc
 --source include/rpl_connection_slave.inc
 --source include/stop_slave.inc
 

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_add_column.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_add_column.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_add_column.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_add_column.test	2011-05-13 07:40:50 +0000
@@ -1,5 +1,5 @@
 --source include/have_ndb.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 #
 # Test add column

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status-master.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_apply_status-master.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_apply_status.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_apply_status.test	2011-05-13 07:40:50 +0000
@@ -7,7 +7,7 @@
 
 # The table might already have been created by mysqld -> ignore error
 --error 0,1
-copy_file $MYSQL_TEST_DIR/suite/rpl_ndb/t/ndb_apply_status.frm $MYSQLTEST_VARDIR/master-data/mysql/ndb_apply_status.frm;
+copy_file $MYSQL_TEST_DIR/suite/ndb_rpl/t/ndb_apply_status.frm $MYSQLTEST_VARDIR/master-data/mysql/ndb_apply_status.frm;
 --disable_result_log
 --disable_abort_on_error
 select * from mysql.ndb_apply_status;
@@ -17,7 +17,7 @@ select * from mysql.ndb_apply_status;
 
 -- source include/have_ndb.inc
 -- source include/have_binlog_format_mixed_or_row.inc
--- source suite/rpl_ndb/ndb_master-slave.inc
+-- source suite/ndb_rpl/ndb_master-slave.inc
 
 #
 # Bug#28170 replicate-ignore-db=mysql should not ignore mysql.ndb_apply_status

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_auto_inc.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_auto_inc.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_auto_inc.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_auto_inc.test	2011-05-13 07:40:50 +0000
@@ -8,7 +8,7 @@
 #####################################
 --source include/have_ndb.inc
 --source include/have_binlog_format_mixed_or_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 --echo ***************** Test 1 ************************
 --echo

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_bank.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_bank.test	2011-05-13 07:40:50 +0000
@@ -13,7 +13,7 @@
 --source include/have_ndb.inc
 --source include/have_ndb_extra.inc
 --source include/have_binlog_format_mixed_or_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 # kill any trailing processes
 --system killall lt-bankTransactionMaker lt-bankTimer lt-bankMakeGL || true

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_basic.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test	2011-04-11 13:36:12 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_basic.test	2011-05-13 07:40:50 +0000
@@ -1,7 +1,7 @@
 --source include/have_ndb.inc
 #error message differs slightly with statement based replication
 --source include/have_binlog_format_mixed_or_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 -- disable_query_log
 call mtr.add_suppression("Slave: Got error 146 during COMMIT Error_code: 1180");

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_bitfield.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_bitfield.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_bitfield.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_bitfield.test	2011-05-13 07:40:50 +0000
@@ -1,6 +1,6 @@
 --source include/have_ndb.inc
 --source include/have_binlog_format_mixed_or_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 #
 # Verifies replication of bit fields

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_blob.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_blob.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_blob.test	2011-05-13 07:40:50 +0000
@@ -1,5 +1,5 @@
 --source include/have_ndb.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 #
 # basic test of blob replication for NDB

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_break_3_chain.cnf' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_break_3_chain.cnf'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_break_3_chain.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_break_3_chain.test'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_bug22045.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_bug22045.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_bug22045.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_bug22045.test	2011-05-13 07:40:50 +0000
@@ -2,7 +2,7 @@
 # Test case currently fails for statement-based replication, as BUG#22045 is
 # not fixed in the replication slave thread.
 --source include/have_binlog_format_mixed_or_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 # BUG#22045: Got error 839 'Illegal null attribute' from NDBCLUSTER when 'Replace Into'.
 # Check that REPLACE INTO replicates correctly with partial value list and with/without blobs.

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_check_for_mixed.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_check_for_mixed.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_check_for_mixed.test	2011-04-11 13:34:50 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_check_for_mixed.test	2011-05-13 07:40:50 +0000
@@ -10,7 +10,7 @@
 
 --source include/have_ndb.inc
 --source include/have_log_bin.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 disable_query_log;
 # so that both ROW and MIXED is output as MIXED

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_circular.test'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.cnf' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch.cnf'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_2ch.test	2011-05-13 07:40:50 +0000
@@ -5,7 +5,7 @@
 # independent channels between two clusters
 #############################################################
 --source include/have_ndb.inc
---source suite/rpl_ndb/ndb_master-slave_2ch.inc
+--source suite/ndb_rpl/ndb_master-slave_2ch.inc
 --source include/have_binlog_format_mixed_or_row.inc
 --echo
 

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_simplex.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_circular_simplex.test	2011-05-13 07:40:50 +0000
@@ -1,5 +1,5 @@
 --source include/have_ndb.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 connection master;
 CREATE TABLE t1 (a int key, b int) ENGINE=NDB;

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict.test	2011-05-13 07:40:50 +0000
@@ -4,7 +4,7 @@
 #
 --source include/have_ndb.inc
 --source include/have_binlog_format_mixed_or_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 --disable_query_log
 --connection master

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_1.inc' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_1.inc'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_1.inc	2011-03-16 11:07:13 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_1.inc	2011-05-13 07:40:50 +0000
@@ -1,5 +1,5 @@
 --connection slave
---source suite/rpl_ndb/t/ndb_conflict_info_init.inc
+--source suite/ndb_rpl/t/ndb_conflict_info_init.inc
 
 --connection master
 
@@ -32,7 +32,7 @@ commit;
 --connection slave
 select * from t1 order by a, d;
 select * from t2 order by a, d;
---source suite/rpl_ndb/t/ndb_conflict_info.inc
+--source suite/ndb_rpl/t/ndb_conflict_info.inc
 
 --echo *** master - update 2 rows in different tables
 --connection master
@@ -43,7 +43,7 @@ update t2 set b="Master t2 a=3 at c=3", 
 --connection slave
 select * from t1 order by a, d;
 select * from t2 order by a, d;
---source suite/rpl_ndb/t/ndb_conflict_info.inc
+--source suite/ndb_rpl/t/ndb_conflict_info.inc
 
 --echo *** master - delete all
 --connection master
@@ -54,8 +54,8 @@ delete from t2;
 --connection slave
 select * from t1 order by a, d;
 select * from t2 order by a, d;
---source suite/rpl_ndb/t/ndb_conflict_info.inc
---source suite/rpl_ndb/t/ndb_conflict_info_init.inc
+--source suite/ndb_rpl/t/ndb_conflict_info.inc
+--source suite/ndb_rpl/t/ndb_conflict_info_init.inc
 
 --echo ************************
 --echo * start conflict testing
@@ -76,7 +76,7 @@ commit;
 --echo *** slave - check conflict info, no conflicts yet
 --sync_slave_with_master
 --connection slave
---source suite/rpl_ndb/t/ndb_conflict_info.inc
+--source suite/ndb_rpl/t/ndb_conflict_info.inc
 
 --echo *** slave - check insert some data
 select * from t1 order by a, d;
@@ -110,7 +110,7 @@ commit;
 --echo *** slave - check conflict info, there should be some
 --sync_slave_with_master
 --connection slave
---source suite/rpl_ndb/t/ndb_conflict_info.inc
+--source suite/ndb_rpl/t/ndb_conflict_info.inc
 
 --echo *** slave - check update some data that causes conflicts
 select * from t1 order by a, d;
@@ -133,7 +133,7 @@ commit;
 --echo *** slave - check conflict info, change depends on calling test
 --sync_slave_with_master
 --connection slave
---source suite/rpl_ndb/t/ndb_conflict_info.inc
+--source suite/ndb_rpl/t/ndb_conflict_info.inc
 
 --echo *** slave - check higer timestamp
 select * from t1 order by a, d;

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_max-master.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_max-master.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_max.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_max.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_max.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_max.test	2011-05-13 07:40:50 +0000
@@ -4,7 +4,7 @@
 #
 --source include/have_ndb.inc
 --source include/have_binlog_format_mixed_or_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 --disable_query_log
 --connection master
@@ -33,7 +33,7 @@ create table `test`.`t1$EX`
 --connection master
 insert into mysql.ndb_replication values ("test", "t1", 0, NULL, "NDB$MAX(X)");
 --let col_type = int unsigned
---source suite/rpl_ndb/t/rpl_ndb_conflict_1.inc
+--source suite/ndb_rpl/t/ndb_rpl_conflict_1.inc
 
 --echo *** Test 2 ********************************************************
 --echo * test native NDB\$MAX() conflict resolution
@@ -44,7 +44,7 @@ insert into mysql.ndb_replication values
 set global ndb_log_update_as_write=1;
 update mysql.ndb_replication set binlog_type=4;
 --let col_type = bigint unsigned
---source suite/rpl_ndb/t/rpl_ndb_conflict_1.inc
+--source suite/ndb_rpl/t/ndb_rpl_conflict_1.inc
 
 --echo *** Test 3 ***********************************************************
 --echo * test that setting binlog type really also sets the "USE_UPDATE" flag
@@ -55,7 +55,7 @@ update mysql.ndb_replication set binlog_
 set global ndb_log_update_as_write=0;
 update mysql.ndb_replication set binlog_type=2;
 --let col_type = int unsigned
---source suite/rpl_ndb/t/rpl_ndb_conflict_1.inc
+--source suite/ndb_rpl/t/ndb_rpl_conflict_1.inc
 
 --echo *** Test 4 ***********************************************************
 --echo * test with FULL rows and "USE_UPDATE" flag
@@ -64,7 +64,7 @@ update mysql.ndb_replication set binlog_
 set global ndb_log_update_as_write=0;
 update mysql.ndb_replication set binlog_type=7;
 --let col_type = int unsigned
---source suite/rpl_ndb/t/rpl_ndb_conflict_1.inc
+--source suite/ndb_rpl/t/ndb_rpl_conflict_1.inc
 
 --echo *** test cleanup
 --disable_query_log

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_max_delete_win-master.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_max_delete_win-master.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_max_delete_win.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_max_delete_win.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_max_delete_win.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_max_delete_win.test	2011-05-13 07:40:50 +0000
@@ -4,7 +4,7 @@
 #
 --source include/have_ndb.inc
 --source include/have_binlog_format_mixed_or_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 --disable_query_log
 --connection master
@@ -33,7 +33,7 @@ create table `test`.`t1$EX`
 --connection master
 insert into mysql.ndb_replication values ("test", "t1", 0, NULL, "NDB$MAX_DELETE_WIN(X)");
 --let col_type = int unsigned
---source suite/rpl_ndb/t/rpl_ndb_conflict_1.inc
+--source suite/ndb_rpl/t/ndb_rpl_conflict_1.inc
 
 --echo *** Test 2 ********************************************************
 --echo * test native NDB\$MAX_DELETE_WIN() conflict resolution
@@ -44,7 +44,7 @@ insert into mysql.ndb_replication values
 set global ndb_log_update_as_write=1;
 update mysql.ndb_replication set binlog_type=4;
 --let col_type = bigint unsigned
---source suite/rpl_ndb/t/rpl_ndb_conflict_1.inc
+--source suite/ndb_rpl/t/ndb_rpl_conflict_1.inc
 
 --echo *** Test 3 ***********************************************************
 --echo * test that setting binlog type really also sets the "USE_UPDATE" flag
@@ -55,7 +55,7 @@ update mysql.ndb_replication set binlog_
 set global ndb_log_update_as_write=0;
 update mysql.ndb_replication set binlog_type=2;
 --let col_type = int unsigned
---source suite/rpl_ndb/t/rpl_ndb_conflict_1.inc
+--source suite/ndb_rpl/t/ndb_rpl_conflict_1.inc
 
 --echo *** Test 4 ***********************************************************
 --echo * test with FULL rows and "USE_UPDATE" flag
@@ -64,7 +64,7 @@ update mysql.ndb_replication set binlog_
 set global ndb_log_update_as_write=0;
 update mysql.ndb_replication set binlog_type=7;
 --let col_type = int unsigned
---source suite/rpl_ndb/t/rpl_ndb_conflict_1.inc
+--source suite/ndb_rpl/t/ndb_rpl_conflict_1.inc
 
 --echo *** test cleanup
 --disable_query_log

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_old-master.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_old-master.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_old.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_old.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_conflict_old.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_old.test	2011-05-13 07:40:50 +0000
@@ -4,7 +4,7 @@
 #
 --source include/have_ndb.inc
 --source include/have_binlog_format_mixed_or_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 --disable_query_log
 --connection master
@@ -33,7 +33,7 @@ create table `test`.`t1$EX`
 --connection master
 insert into mysql.ndb_replication values ("test", "t1", 0, NULL, "NDB$OLD(X)");
 --let col_type = int unsigned
---source suite/rpl_ndb/t/rpl_ndb_conflict_1.inc
+--source suite/ndb_rpl/t/ndb_rpl_conflict_1.inc
 
 --echo *** Test 2 ********************************************************
 --echo * test native NDB\$OLD() conflict resolution
@@ -44,7 +44,7 @@ insert into mysql.ndb_replication values
 set global ndb_log_update_as_write=1;
 update mysql.ndb_replication set binlog_type=4;
 --let col_type = bigint unsigned
---source suite/rpl_ndb/t/rpl_ndb_conflict_1.inc
+--source suite/ndb_rpl/t/ndb_rpl_conflict_1.inc
 
 --echo *** Test 3 ***********************************************************
 --echo * test that setting binlog type really also sets the "USE_UPDATE" flag
@@ -55,7 +55,7 @@ update mysql.ndb_replication set binlog_
 set global ndb_log_update_as_write=0;
 update mysql.ndb_replication set binlog_type=2;
 --let col_type = int unsigned
---source suite/rpl_ndb/t/rpl_ndb_conflict_1.inc
+--source suite/ndb_rpl/t/ndb_rpl_conflict_1.inc
 
 --echo *** Test 4 ***********************************************************
 --echo * test with FULL rows and "USE_UPDATE" flag
@@ -64,7 +64,7 @@ update mysql.ndb_replication set binlog_
 set global ndb_log_update_as_write=0;
 update mysql.ndb_replication set binlog_type=7;
 --let col_type = int unsigned
---source suite/rpl_ndb/t/rpl_ndb_conflict_1.inc
+--source suite/ndb_rpl/t/ndb_rpl_conflict_1.inc
 
 --echo *** test cleanup
 --disable_query_log

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def-master.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_ctype_ucs2_def-master.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_ctype_ucs2_def.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_ctype_ucs2_def.test	2011-05-13 07:40:50 +0000
@@ -1,6 +1,6 @@
 --source include/have_ucs2.inc
 --source include/have_ndb.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 #
 # MySQL Bug#15276: MySQL ignores collation-server

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_dd_advance.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_dd_advance.test	2011-05-13 07:40:50 +0000
@@ -7,7 +7,7 @@
 --source include/have_binlog_format_mixed_or_row.inc
 --source include/ndb_default_cluster.inc
 --source include/not_embedded.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 ######################################################
 # Requirment: Cluster DD and replication must be able#

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_basic.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_dd_basic.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_basic.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_dd_basic.test	2011-05-13 07:40:50 +0000
@@ -1,6 +1,6 @@
 --source include/have_ndb.inc
 --source include/have_binlog_format_mixed_or_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1;

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-master.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_dd_partitions-master.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-slave.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_dd_partitions-slave.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_dd_partitions.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_dd_partitions.test	2011-05-13 07:40:50 +0000
@@ -7,7 +7,7 @@
 
 --source include/have_ndb.inc
 --source include/have_binlog_format_mixed_or_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 --echo --- Doing pre test cleanup --- 
 

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db-slave.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_do_db-slave.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_do_db.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_do_db.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_do_db.test	2011-05-13 07:40:50 +0000
@@ -6,7 +6,7 @@
 ##########################################################
 
 --source include/have_ndb.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS replica;

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table-slave.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_do_table-slave.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_do_table.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_do_table.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_do_table.test	2011-05-13 07:40:50 +0000
@@ -6,7 +6,7 @@
 ##########################################################
 
 --source include/have_ndb.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1, t2;

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_empty_epoch.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_empty_epoch.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_empty_epoch.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_empty_epoch.test	2011-05-13 07:40:50 +0000
@@ -1,6 +1,6 @@
 --source include/have_ndb.inc
 --source include/have_binlog_format_mixed_or_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 CREATE TABLE t1 (
  id INT UNSIGNED NOT NULL AUTO_INCREMENT,

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_gap_event-master.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_gap_event-master.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_gap_event.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_gap_event.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_gap_event.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_gap_event.test	2011-05-13 07:40:50 +0000
@@ -1,6 +1,6 @@
 --source include/have_ndb.inc
 --source include/have_binlog_format_mixed_or_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 --connection master
 create table t1(pk int not null primary key, i int) engine = ndb;

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_get_binlog_events.inc' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_get_binlog_events.inc'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_idempotent.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_idempotent.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_idempotent.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_idempotent.test	2011-05-13 07:40:50 +0000
@@ -1,6 +1,6 @@
 --source include/have_ndb.inc
 --source include/have_binlog_format_mixed_or_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 #
 # Currently test only works with ndb since it retrieves "old"

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_ignore_db-master.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_ignore_db-master.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_ignore_db.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_ignore_db.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_ignore_db.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_ignore_db.test	2011-05-13 07:40:50 +0000
@@ -1,6 +1,6 @@
 --source include/have_ndb.inc
 --source include/have_binlog_format_mixed_or_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 # We are not binlogging changes to the mysql db.  Check
 # that changes to tables in the mysql db are not replicated

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-master.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb2ndb-master.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-slave.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb2ndb-slave.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb2ndb.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test	2011-04-20 11:50:29 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb2ndb.test	2011-05-13 07:40:50 +0000
@@ -10,7 +10,7 @@
 -- source include/have_innodb.inc
 -- source include/have_ndb.inc
 -- source include/have_binlog_format_mixed_or_row.inc
--- source suite/rpl_ndb/ndb_master-slave.inc
+-- source suite/ndb_rpl/ndb_master-slave.inc
 SET storage_engine=innodb;
---source suite/rpl_ndb/t/rpl_ndb_2multi_eng.inc
+--source suite/ndb_rpl/t/ndb_rpl_2multi_eng.inc
 --source include/rpl_end.inc

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans-slave.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb_trans-slave.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb_trans.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_innodb_trans.test	2011-05-13 07:40:50 +0000
@@ -2,7 +2,7 @@
 
 -- source include/have_ndb.inc
 -- source include/have_innodb.inc
--- source suite/rpl_ndb/ndb_master-slave.inc
+-- source suite/ndb_rpl/ndb_master-slave.inc
 
 create table t1 (a int, unique(a)) engine=ndbcluster;
 create table t2 (a int, unique(a)) engine=innodb;

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_load.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_load.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_load.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_load.test	2011-05-13 07:40:50 +0000
@@ -7,7 +7,7 @@
 --source include/have_ndb.inc
 --source include/have_ndb_extra.inc
 --source include/have_binlog_format_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 --disable_warnings
 # reset master

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_logging.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_logging.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_logging.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_logging.test	2011-05-13 07:40:50 +0000
@@ -3,7 +3,7 @@
 #
 --source include/have_ndb.inc
 --source include/have_binlog_format_mixed_or_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 --disable_warnings
 --disable_query_log

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_eng_trans-master.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_mix_eng_trans-master.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_eng_trans-slave.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_mix_eng_trans-slave.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_eng_trans.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_mix_eng_trans.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_eng_trans.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_mix_eng_trans.test	2011-05-13 07:40:50 +0000
@@ -23,7 +23,7 @@
 
 
 source include/have_ndb.inc;
-source suite/rpl_ndb/ndb_master-slave.inc;
+source suite/ndb_rpl/ndb_master-slave.inc;
 source include/have_innodb.inc;
 
 CREATE TABLE tmyisam (a int) ENGINE = MYISAM;

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb-master.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_mix_innodb-master.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_mix_innodb.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb.test	2011-04-19 14:34:27 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_mix_innodb.test	2011-05-13 07:40:50 +0000
@@ -8,10 +8,10 @@
 --source include/have_ndb.inc
 --source include/have_innodb.inc
 --source include/have_binlog_format_mixed.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 --enable_query_log
 let $off_set = 9;
 let $rpl_format = 'MIX';
---source suite/rpl_ndb/t/rpl_ndb_xxx_innodb.inc
+--source suite/ndb_rpl/t/ndb_rpl_xxx_innodb.inc
 
 --source include/rpl_end.inc

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables-master.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_mixed_tables-master.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables-slave.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_mixed_tables-slave.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_mixed_tables.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_mixed_tables.test	2011-05-13 07:40:50 +0000
@@ -44,7 +44,7 @@
 
 --source include/have_ndb.inc
 --source include/have_innodb.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 --echo ---- setup master ----
 

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_multi.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_multi.test'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_binlog_update.cnf' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_multi_binlog_update.cnf'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_binlog_update.inc' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_multi_binlog_update.inc'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_binlog_update.inc	2011-04-27 06:29:23 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_multi_binlog_update.inc	2011-05-13 07:40:50 +0000
@@ -145,7 +145,7 @@ show variables like 'log_bin';
 show variables like 'log_slave_updates';
 --source include/show_binlog_events2.inc
 let $BINLOG_FILENAME=master-bin;
---source suite/rpl_ndb/t/rpl_ndb_get_binlog_events.inc
+--source suite/ndb_rpl/t/ndb_rpl_get_binlog_events.inc
 
 
 connection srv_master1;
@@ -168,7 +168,7 @@ show variables like 'log_bin';
 show variables like 'log_slave_updates';
 --source include/show_binlog_events2.inc
 let $BINLOG_FILENAME=master-bin;
---source suite/rpl_ndb/t/rpl_ndb_get_binlog_events.inc
+--source suite/ndb_rpl/t/ndb_rpl_get_binlog_events.inc
 
 connection srv_slave;
 --echo 
@@ -190,7 +190,7 @@ show variables like 'log_bin';
 show variables like 'log_slave_updates';
 --source include/show_binlog_events2.inc
 let $BINLOG_FILENAME=slave-master-bin;
---source suite/rpl_ndb/t/rpl_ndb_get_binlog_events.inc
+--source suite/ndb_rpl/t/ndb_rpl_get_binlog_events.inc
 
 connection srv_slave2;
 --echo 
@@ -202,6 +202,6 @@ show variables like 'log_bin';
 show variables like 'log_slave_updates';
 --source include/show_binlog_events2.inc
 let $BINLOG_FILENAME=slave-master-bin;
---source suite/rpl_ndb/t/rpl_ndb_get_binlog_events.inc
+--source suite/ndb_rpl/t/ndb_rpl_get_binlog_events.inc
 
 connection $which_slave;
\ No newline at end of file

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2-slave.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_multi_update2-slave.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-slave.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_myisam2ndb-slave.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_myisam2ndb.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test	2011-04-20 11:50:29 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_myisam2ndb.test	2011-05-13 07:40:50 +0000
@@ -9,7 +9,7 @@
 ##############################################################
 -- source include/have_ndb.inc
 -- source include/have_binlog_format_mixed_or_row.inc
--- source suite/rpl_ndb/ndb_master-slave.inc
+-- source suite/ndb_rpl/ndb_master-slave.inc
 SET storage_engine=myisam;
---source suite/rpl_ndb/t/rpl_ndb_2multi_eng.inc
+--source suite/ndb_rpl/t/ndb_rpl_2multi_eng.inc
 --source include/rpl_end.inc

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_ndbapi_multi.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_ndbapi_multi.test	2011-05-13 07:40:50 +0000
@@ -1,7 +1,7 @@
 -- source include/have_ndb.inc
 -- source include/have_binlog_format_mixed_or_row.inc
 -- source include/have_ndbapi_examples.inc
--- source suite/rpl_ndb/ndb_master-slave.inc
+-- source suite/ndb_rpl/ndb_master-slave.inc
 --let MASTER_MYSOCK=`select @@socket`;
 
 --exec echo Running ndbapi_simple_dual

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate-slave.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_relayrotate-slave.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_error.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_rep_error.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_error.test	2010-10-22 15:16:26 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_rep_error.test	2011-05-13 07:40:50 +0000
@@ -4,7 +4,7 @@
 #
 --source include/have_ndb.inc
 --source include/have_binlog_format_mixed_or_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 #
 # wrong schema for the table

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore-slave.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_rep_ignore-slave.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_rep_ignore.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_rep_ignore.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_rep_ignore.test	2011-05-13 07:40:50 +0000
@@ -7,7 +7,7 @@
 ##########################################################
 
 --source include/have_ndb.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 --disable_warnings
 DROP DATABASE IF EXISTS replica;

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_skip_gap_event-slave.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_skip_gap_event-slave.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_skip_gap_event.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_skip_gap_event.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_skip_gap_event.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_skip_gap_event.test	2011-05-13 07:40:50 +0000
@@ -1,6 +1,6 @@
 --source include/have_ndb.inc
 --source include/have_binlog_format_mixed_or_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 --connection master
 create table t1(pk int not null primary key, i int) engine = ndb;

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_slave_lsu.cnf' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_lsu.cnf'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_slave_lsu.cnf	2009-09-16 16:04:14 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_lsu.cnf	2011-05-13 07:40:50 +0000
@@ -1 +1 @@
-!include suite/rpl_ndb/t/rpl_ndb_multi_binlog_update.cnf
+!include suite/ndb_rpl/t/ndb_rpl_multi_binlog_update.cnf

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_slave_lsu.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_lsu.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_slave_lsu.test	2011-04-27 06:29:23 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_lsu.test	2011-05-13 07:40:50 +0000
@@ -18,7 +18,7 @@
 #  - Second replicate via srv_slave1 and check all nodes' Binlog contents
 #  - Third replicate via srv_slave2 and check all nodes' Binlog contents
 #
-# Makes use of suite/rpl_ndb/t/rpl_ndb_multi_binlog_update.inc
+# Makes use of suite/ndb_rpl/t/ndb_rpl_multi_binlog_update.inc
 # Originally motivated by bug#45756
 ###############################################################################
 
@@ -66,36 +66,36 @@
 # Check schema op binlogging enabled between servers on cluster1
 --let $source_server=srv_master
 --let $dest_server=srv_master2
-source suite/rpl_ndb/t/rpl_ndb_wait_schema_logging.inc;
+source suite/ndb_rpl/t/wait_schema_logging.inc;
 
 --let $source_server=srv_master1
 --let $dest_server=srv_master
-source suite/rpl_ndb/t/rpl_ndb_wait_schema_logging.inc;
+source suite/ndb_rpl/t/wait_schema_logging.inc;
 
 --let $source_server=srv_master1
 --let $dest_server=srv_master2
-source suite/rpl_ndb/t/rpl_ndb_wait_schema_logging.inc;
+source suite/ndb_rpl/t/wait_schema_logging.inc;
 
 --let $source_server=srv_master2
 --let $dest_server=srv_master
-source suite/rpl_ndb/t/rpl_ndb_wait_schema_logging.inc;
+source suite/ndb_rpl/t/wait_schema_logging.inc;
 
 # Check schema op binlogging enabled between servers on cluster2
 --let $source_server=srv_slave
 --let $dest_server=srv_slave1
-source suite/rpl_ndb/t/rpl_ndb_wait_schema_logging.inc;
+source suite/ndb_rpl/t/wait_schema_logging.inc;
 
 --let $source_server=srv_slave
 --let $dest_server=srv_slave2
-source suite/rpl_ndb/t/rpl_ndb_wait_schema_logging.inc;
+source suite/ndb_rpl/t/wait_schema_logging.inc;
 
 --let $source_server=srv_slave1
 --let $dest_server=srv_slave2
-source suite/rpl_ndb/t/rpl_ndb_wait_schema_logging.inc;
+source suite/ndb_rpl/t/wait_schema_logging.inc;
 
 --let $source_server=srv_slave2
 --let $dest_server=srv_slave1
-source suite/rpl_ndb/t/rpl_ndb_wait_schema_logging.inc;
+source suite/ndb_rpl/t/wait_schema_logging.inc;
 
 # Reset state of all Binlogging nodes
 --disable_query_log
@@ -133,7 +133,7 @@ RESET MASTER;
 
 # Run the test script
 --let $which_slave=srv_slave
---source suite/rpl_ndb/t/rpl_ndb_multi_binlog_update.inc
+--source suite/ndb_rpl/t/ndb_rpl_multi_binlog_update.inc
 
 --source include/stop_slave.inc
 
@@ -173,7 +173,7 @@ RESET MASTER;
 
 # Run the test script
 --let $which_slave=srv_slave1
---source suite/rpl_ndb/t/rpl_ndb_multi_binlog_update.inc
+--source suite/ndb_rpl/t/ndb_rpl_multi_binlog_update.inc
 
 --source include/stop_slave.inc
 
@@ -213,7 +213,7 @@ RESET MASTER;
 
 # Run the test script
 --let $which_slave=srv_slave2
---source suite/rpl_ndb/t/rpl_ndb_multi_binlog_update.inc
+--source suite/ndb_rpl/t/ndb_rpl_multi_binlog_update.inc
 
 --source include/stop_slave.inc
 

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_slave_lsu_anyval.cnf' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_lsu_anyval.cnf'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_slave_lsu_anyval.cnf	2010-07-02 11:01:48 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_lsu_anyval.cnf	2011-05-13 07:40:50 +0000
@@ -1,4 +1,4 @@
-!include suite/rpl_ndb/t/rpl_ndb_multi_binlog_update.cnf
+!include suite/ndb_rpl/t/ndb_rpl_multi_binlog_update.cnf
 
 [mysqld]
 # Low ServerId bits and NDB_TEST_ANYVALUE_USERDATA below

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_slave_lsu_anyval.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_lsu_anyval.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_slave_lsu_anyval.test	2010-07-02 11:01:48 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_lsu_anyval.test	2011-05-13 07:40:50 +0000
@@ -36,4 +36,4 @@
 #        into the binlog of the slave running with --log-slave-updates on.
 ###############################################################################
 --source include/have_debug.inc
---source suite/rpl_ndb/t/rpl_ndb_slave_lsu.test
+--source suite/ndb_rpl/t/ndb_rpl_slave_lsu.test

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_slave_restart.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_restart.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_slave_restart.test	2011-04-08 12:52:26 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_slave_restart.test	2011-05-13 07:40:50 +0000
@@ -1,6 +1,6 @@
 --source include/have_multi_ndb.inc
 --source include/have_binlog_format_mixed_or_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 # note: server2 is another "master" connected to the master cluster
 

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-master.opt' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_stm_innodb-master.opt'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_stm_innodb.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test	2011-04-19 14:34:27 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_stm_innodb.test	2011-05-13 07:40:50 +0000
@@ -9,12 +9,12 @@
 --disable_query_log
 --source include/have_ndb.inc
 --source include/have_innodb.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 --enable_query_log
 
 # statement format is supported because master uses innodb
 SET binlog_format = STATEMENT;
 let $off_set = 6;
 let $rpl_format = 'SBR';
---source suite/rpl_ndb/t/rpl_ndb_xxx_innodb.inc
+--source suite/ndb_rpl/t/ndb_rpl_xxx_innodb.inc
 --source include/rpl_end.inc

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_sync.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_sync.test	2011-05-13 07:40:50 +0000
@@ -2,7 +2,7 @@
 --source include/ndb_default_cluster.inc
 --source include/not_embedded.inc
 --source include/have_binlog_format_mixed_or_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 #
 # Currently test only works with ndb since it retrieves "old"

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_ui.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_ui.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_ui.test	2011-04-28 07:47:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_ui.test	2011-05-13 07:40:50 +0000
@@ -1,6 +1,6 @@
 --source include/have_ndb.inc
 --source include/have_binlog_format_mixed_or_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 #
 # Slave behaviour when replicating unique index operations

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_ui2.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_ui2.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_ui2.test	2011-04-28 07:47:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_ui2.test	2011-05-13 07:40:50 +0000
@@ -1,6 +1,6 @@
 --source include/have_ndb.inc
 --source include/have_binlog_format_mixed_or_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 --connection master
 

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_ui3.test' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_ui3.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_ui3.test	2011-04-28 07:47:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_ui3.test	2011-05-13 07:40:50 +0000
@@ -1,6 +1,6 @@
 --source include/have_ndb.inc
 --source include/have_binlog_format_mixed_or_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 
 #
 # Slave behaviour when replicating unique index operations

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_xxx_innodb.inc' => 'mysql-test/suite/ndb_rpl/t/ndb_rpl_xxx_innodb.inc'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_xxx_innodb.inc	2011-04-19 14:34:27 +0000
+++ b/mysql-test/suite/ndb_rpl/t/ndb_rpl_xxx_innodb.inc	2011-05-13 07:40:50 +0000
@@ -45,7 +45,7 @@ insert into t1 values (1,2);
 --echo
 
 --sync_slave_with_master
---source suite/rpl_ndb/t/select_ndb_apply_status.inc
+--source suite/ndb_rpl/t/select_ndb_apply_status.inc
 
 --echo
 
@@ -85,7 +85,7 @@ commit;
 --echo
 
 --sync_slave_with_master
---source suite/rpl_ndb/t/select_ndb_apply_status.inc
+--source suite/ndb_rpl/t/select_ndb_apply_status.inc
 
 connection master;
 --let $binlog_start= $start_pos
@@ -158,7 +158,7 @@ SET AUTOCOMMIT=1;
 --enable_query_log
 
 --sync_slave_with_master
---source suite/rpl_ndb/t/select_ndb_apply_status.inc
+--source suite/ndb_rpl/t/select_ndb_apply_status.inc
 
 --echo
 
@@ -208,7 +208,7 @@ SET AUTOCOMMIT=1;
 --echo
 
 --sync_slave_with_master
---source suite/rpl_ndb/t/select_ndb_apply_status.inc
+--source suite/ndb_rpl/t/select_ndb_apply_status.inc
 
 --echo
 
@@ -256,7 +256,7 @@ SET AUTOCOMMIT=1;
 --enable_query_log
 
 --sync_slave_with_master
---source suite/rpl_ndb/t/select_ndb_apply_status.inc
+--source suite/ndb_rpl/t/select_ndb_apply_status.inc
 
 --echo
 
@@ -281,7 +281,7 @@ DROP DATABASE tpcb;
 
 ####### Commenting out until decision on Bug#27960 ###########
 
-#--source suite/rpl_ndb/t/select_ndb_apply_status.inc
+#--source suite/ndb_rpl/t/select_ndb_apply_status.inc
 
 #connection master;
 #--eval SHOW BINLOG EVENTS in '$log_name' from $start_pos

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb.test' => 'mysql-test/suite/ndb_rpl/t/rpl_truncate_7ndb.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/ndb_rpl/t/rpl_truncate_7ndb.test	2011-05-13 07:40:50 +0000
@@ -1,6 +1,6 @@
 
 --source include/have_ndb.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source suite/ndb_rpl/ndb_master-slave.inc
 --source include/have_binlog_format_mixed_or_row.inc
 
 --disable_query_log

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test' => 'mysql-test/suite/ndb_rpl/t/rpl_truncate_7ndb_2.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test	2011-03-29 14:09:05 +0000
+++ b/mysql-test/suite/ndb_rpl/t/rpl_truncate_7ndb_2.test	2011-05-13 07:40:50 +0000
@@ -7,4 +7,4 @@
 # Change:  Moved test to rpl_ndb suite, updated location of --source .test file
 
 --source include/have_binlog_format_mixed_or_row.inc
---source suite/rpl_ndb/t/rpl_truncate_7ndb.test
+--source suite/ndb_rpl/t/rpl_truncate_7ndb.test

=== renamed file 'mysql-test/suite/rpl_ndb/t/select_ndb_apply_status.inc' => 'mysql-test/suite/ndb_rpl/t/select_ndb_apply_status.inc'
=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_wait_schema_logging.inc' => 'mysql-test/suite/ndb_rpl/t/wait_schema_logging.inc'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_wait_schema_logging.inc	2009-09-16 16:04:14 +0000
+++ b/mysql-test/suite/ndb_rpl/t/wait_schema_logging.inc	2011-05-13 07:40:50 +0000
@@ -1,4 +1,4 @@
-# suite/t/rpl_ndb/rpl_ndb_wait_schema_logging.inc
+# suite/t/rpl_ndb/wait_schema_logging.inc
 #
 # SUMMARY
 #   Waits until schema op performed on $source_server is
@@ -49,8 +49,8 @@ while (`SELECT INSTR("$_event","$wait_bi
 
   connection $source_server;
   --disable_query_log
-  create table rpl_ndb_wait_schema_logging (a int primary key) engine=ndb;
-  drop table rpl_ndb_wait_schema_logging;
+  create table wait_schema_logging (a int primary key) engine=ndb;
+  drop table wait_schema_logging;
   --enable_query_log
   connection $dest_server;
 

=== renamed file 'mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result' => 'mysql-test/suite/rpl_ndb/r/rpl_ndb_row_basic.result'
=== modified file 'mysql-test/suite/rpl_ndb/t/disabled.def'
--- a/mysql-test/suite/rpl_ndb/t/disabled.def	2010-03-12 13:57:24 +0000
+++ b/mysql-test/suite/rpl_ndb/t/disabled.def	2011-05-13 07:40:50 +0000
@@ -10,5 +10,4 @@
 #
 ##############################################################################
 
-rpl_ndb_ctype_ucs2_def : bug #34661 rpl_ndb_ctype_ucs2_def fails in 6.2
 rpl_ndb_set_null       : bug #51100

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_UUID.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_UUID.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_UUID.test	2011-05-13 07:40:50 +0000
@@ -3,7 +3,7 @@
 ########################################################
 --source include/have_ndb.inc
 --source include/have_binlog_format_mixed_or_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source include/master-slave.inc
 let $engine_type=NDB;
 --source extra/rpl_tests/rpl_row_UUID.test
 --source include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_blob2.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_blob2.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_blob2.test	2011-05-13 07:40:50 +0000
@@ -4,7 +4,7 @@
 # code between engine tests     #
 #################################
 -- source include/have_ndb.inc
--- source suite/rpl_ndb/ndb_master-slave.inc
+-- source include/master-slave.inc
 let $engine_type=NDBCLUSTER;
 -- source extra/rpl_tests/rpl_row_blob.test
 

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test	2011-05-13 07:40:50 +0000
@@ -5,7 +5,7 @@
 # By JBM 2004-02-15                 #
 #####################################
 -- source include/have_ndb.inc
--- source suite/rpl_ndb/ndb_master-slave.inc
+-- source include/master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_commit_after_flush.test
 --source include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_ddl.test	2011-05-13 07:40:50 +0000
@@ -25,7 +25,7 @@
 
 --source include/have_ndb.inc
 --source include/have_binlog_format_mixed_or_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source include/master-slave.inc
 let $engine_type= NDB;
 let $temp_engine_type= MEMORY;
 let $show_binlog = 0;

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_delete_nowhere.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_delete_nowhere.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_delete_nowhere.test	2011-05-13 07:40:50 +0000
@@ -3,7 +3,7 @@
 # Share test code between engine tests  #
 #########################################
 --source include/have_ndb.inc
--- source suite/rpl_ndb/ndb_master-slave.inc
+-- source include/master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_delete_no_where.test
 --source include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_extra_col_master.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_extra_col_master.test	2011-04-27 08:22:04 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_extra_col_master.test	2011-05-13 07:40:50 +0000
@@ -2,7 +2,7 @@
 # Purpose: To test having extra columns on the master WL#3915
 #############################################################
 -- source include/have_ndb.inc
--- source suite/rpl_ndb/ndb_master-slave.inc
+-- source include/master-slave.inc
 -- source include/have_binlog_format_mixed_or_row.inc
 
 let $engine_type = 'NDB';

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_extra_col_slave.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_extra_col_slave.test	2011-04-27 08:14:37 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_extra_col_slave.test	2011-05-13 07:40:50 +0000
@@ -1,6 +1,6 @@
 -- source include/have_binlog_format_row.inc
 -- source include/have_ndb.inc
--- source suite/rpl_ndb/ndb_master-slave.inc
+-- source include/master-slave.inc
 
 #
 # This is a disgrace...but slave randomly spits out these warnings

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_func003.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_func003.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_func003.test	2011-05-13 07:40:50 +0000
@@ -7,7 +7,7 @@
 # reduce test case code           #
 ###################################
 -- source include/have_ndb.inc
--- source suite/rpl_ndb/ndb_master-slave.inc
+-- source include/master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_row_func003.test
 --source include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_insert_ignore.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_insert_ignore.test	2011-04-27 07:59:12 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_insert_ignore.test	2011-05-13 07:40:50 +0000
@@ -3,7 +3,7 @@
 #####################################
 -- source include/have_ndb.inc
 -- source include/have_binlog_format_row.inc
--- source suite/rpl_ndb/ndb_master-slave.inc
+-- source include/master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_insert_ignore.test
 --source include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update2.test	2011-05-13 07:40:50 +0000
@@ -7,7 +7,7 @@
 # Run this only for row based replication, as replication of
 # auto_increment values are not supported with NDB as storage engine
 -- source include/have_binlog_format_mixed_or_row.inc
--- source suite/rpl_ndb/ndb_master-slave.inc
+-- source include/master-slave.inc
 
 let $engine_type=NDB;
 --source extra/rpl_tests/rpl_multi_update2.test

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update3.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update3.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_multi_update3.test	2011-05-13 07:40:50 +0000
@@ -3,7 +3,7 @@
 # to reuse test code between engine runs                   #
 ############################################################
 -- source include/have_ndb.inc
--- source suite/rpl_ndb/ndb_master-slave.inc
+-- source include/master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_multi_update3.test
 --source include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate.test	2011-04-15 12:45:47 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_relayrotate.test	2011-05-13 07:40:50 +0000
@@ -3,7 +3,7 @@
 # to reuse test code between engine runs                   #
 ############################################################
 -- source include/have_ndb.inc
--- source suite/rpl_ndb/ndb_master-slave.inc
+-- source include/master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_relayrotate.test
 --source include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_row_001.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_row_001.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_row_001.test	2011-05-13 07:40:50 +0000
@@ -2,7 +2,7 @@
 # By JBM 2005-02-15 Wrapped to allow reuse of test code#
 ########################################################
 --source include/have_ndb.inc
--- source suite/rpl_ndb/ndb_master-slave.inc
+-- source include/master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_row_001.test
 --source include/rpl_end.inc

=== renamed file 'mysql-test/suite/rpl_ndb/t/rpl_row_basic_7ndb.test' => 'mysql-test/suite/rpl_ndb/t/rpl_ndb_row_basic.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_row_basic_7ndb.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_row_basic.test	2011-05-13 07:40:50 +0000
@@ -1,6 +1,6 @@
 -- source include/have_ndb.inc
 -- source include/have_binlog_format_mixed_or_row.inc
--- source suite/rpl_ndb/ndb_master-slave.inc
+-- source include/master-slave.inc
 
 let $type= 'NDB' ;
 let $extra_index= ;

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_set_null.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_set_null.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_set_null.test	2011-05-13 07:40:50 +0000
@@ -1,6 +1,6 @@
 -- source include/have_ndb.inc
 -- source include/have_binlog_format_mixed_or_row.inc
--- source suite/rpl_ndb/ndb_master-slave.inc
+-- source include/master-slave.inc
 
 -- let $engine= NDB
 -- source extra/rpl_tests/rpl_set_null.test

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_sp003.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_sp003.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_sp003.test	2011-05-13 07:40:50 +0000
@@ -5,7 +5,7 @@
 # For different engines         #
 #################################
 -- source include/have_ndb.inc
--- source suite/rpl_ndb/ndb_master-slave.inc
+-- source include/master-slave.inc
 let $engine_type=NDBCLUSTER;
 -- source extra/rpl_tests/rpl_row_sp003.test
 --source include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_sp006.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_sp006.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_sp006.test	2011-05-13 07:40:50 +0000
@@ -5,7 +5,7 @@
 # For different engines         #
 #################################
 -- source include/have_ndb.inc
--- source suite/rpl_ndb/ndb_master-slave.inc
+-- source include/master-slave.inc
 let $engine_type=NDBCLUSTER;
 -- source extra/rpl_tests/rpl_row_sp006.test
 --source include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_trig004.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_trig004.test	2011-04-08 11:06:53 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_trig004.test	2011-05-13 07:40:50 +0000
@@ -8,7 +8,7 @@
 
 # Includes
 -- source include/have_ndb.inc
--- source suite/rpl_ndb/ndb_master-slave.inc
+-- source include/master-slave.inc
 let $engine_type=NDB;
 -- source extra/rpl_tests/rpl_trig004.test
 

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_all.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_all.test	2011-04-21 12:36:25 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_all.test	2011-05-13 07:40:50 +0000
@@ -1,6 +1,6 @@
 --source include/have_ndb.inc
 --source include/have_binlog_format_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source include/master-slave.inc
 let $engine_type=NDBCLUSTER;
 
 connection slave;

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_lossy.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_lossy.test	2011-04-21 12:36:25 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_lossy.test	2011-05-13 07:40:50 +0000
@@ -1,6 +1,6 @@
 --source include/have_ndb.inc
 --source include/have_binlog_format_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source include/master-slave.inc
 let $engine_type=NDBCLUSTER;
 
 connection slave;

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_nonlossy.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_nonlossy.test	2011-04-21 12:36:25 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_nonlossy.test	2011-05-13 07:40:50 +0000
@@ -1,6 +1,6 @@
 --source include/have_ndb.inc
 --source include/have_binlog_format_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source include/master-slave.inc
 let $engine_type=NDBCLUSTER;
 
 connection slave;

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_strict.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_strict.test	2011-04-21 12:36:25 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_strict.test	2011-05-13 07:40:50 +0000
@@ -1,6 +1,6 @@
 --source include/have_ndb.inc
 --source include/have_binlog_format_row.inc
---source suite/rpl_ndb/ndb_master-slave.inc
+--source include/master-slave.inc
 let $engine_type=NDBCLUSTER;
 
 connection slave;

Attachment: [text/bzr-bundle] bzr/magnus.blaudd@oracle.com-20110513074050-4xtl4y3yl25invxd.bundle
Thread
bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4350) Magnus Blåudd13 May