Alexander Nozdrin 417e138470 Manual merge from mysql-trunk-merge. ... Conflicts: - mysql-test/collections/default.experimental - mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result - mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test		2010-01-31 00:26:38 +03:00
..
disabled.def
rpl_ndb_2innodb-master.opt
rpl_ndb_2innodb-slave.opt
rpl_ndb_2innodb.test
rpl_ndb_2myisam-master.opt
rpl_ndb_2myisam-slave.opt
rpl_ndb_2myisam.test
rpl_ndb_2ndb-slave.opt
rpl_ndb_2ndb.test
rpl_ndb_2other-slave.opt
rpl_ndb_2other.test
rpl_ndb_apply_status-master.opt
rpl_ndb_apply_status.test
rpl_ndb_auto_inc.test
rpl_ndb_bank.test
rpl_ndb_basic.test
rpl_ndb_binlog_format_errors-master.opt
rpl_ndb_binlog_format_errors-slave.opt
rpl_ndb_binlog_format_errors.test
rpl_ndb_blob.test
rpl_ndb_blob2.test
rpl_ndb_circular.test
rpl_ndb_circular_2ch.cnf
rpl_ndb_circular_2ch.test
rpl_ndb_circular_simplex.test
rpl_ndb_commit_afterflush.test
rpl_ndb_ctype_ucs2_def-master.opt
rpl_ndb_ctype_ucs2_def.test
rpl_ndb_dd_basic.test
rpl_ndb_dd_partitions-master.opt
rpl_ndb_dd_partitions-slave.opt
rpl_ndb_dd_partitions.test
rpl_ndb_ddl.test
rpl_ndb_delete_nowhere.test
rpl_ndb_do_db-slave.opt
rpl_ndb_do_db.test
rpl_ndb_do_table-slave.opt
rpl_ndb_do_table.test
rpl_ndb_extraCol.test
rpl_ndb_func003.test
rpl_ndb_idempotent.test
rpl_ndb_innodb2ndb-master.opt
rpl_ndb_innodb2ndb-slave.opt
rpl_ndb_innodb2ndb.test
rpl_ndb_innodb_trans-slave.opt
rpl_ndb_innodb_trans.test
rpl_ndb_insert_ignore.test
rpl_ndb_load.test
rpl_ndb_log-master.opt
rpl_ndb_log.test
rpl_ndb_mixed_engines_transactions-master.opt
rpl_ndb_mixed_engines_transactions-slave.opt
rpl_ndb_mixed_engines_transactions.test
rpl_ndb_mixed_implicit_commit_binlog.test
rpl_ndb_mixed_tables-master.opt
rpl_ndb_mixed_tables-slave.opt
rpl_ndb_mixed_tables.test
rpl_ndb_multi.test
rpl_ndb_multi_update2-slave.opt
rpl_ndb_multi_update2.test
rpl_ndb_multi_update3.test
rpl_ndb_myisam2ndb-slave.opt
rpl_ndb_myisam2ndb.test
rpl_ndb_relayrotate-slave.opt
rpl_ndb_relayrotate.test
rpl_ndb_rep_ignore-slave.opt
rpl_ndb_rep_ignore.test
rpl_ndb_row_001.test
rpl_ndb_row_implicit_commit_binlog.test
rpl_ndb_set_null.test
rpl_ndb_sp003.test
rpl_ndb_sp006.test
rpl_ndb_stm_innodb-master.opt
rpl_ndb_stm_innodb.test
rpl_ndb_sync.test
rpl_ndb_trig004.test
rpl_ndb_UUID.test
rpl_ndbapi_multi.test
rpl_row_basic_7ndb.test
rpl_truncate_7ndb.test
rpl_truncate_7ndb_2-master.opt
rpl_truncate_7ndb_2.test