Luis Soares df8543868d merge: 5.1 -> 5.1-rpl ... conflicts: Text conflict in client/mysqltest.cc Text conflict in mysql-test/include/wait_until_connected_again.inc Text conflict in mysql-test/lib/mtr_report.pm Text conflict in mysql-test/mysql-test-run.pl Text conflict in mysql-test/r/events_bugs.result Text conflict in mysql-test/r/log_state.result Text conflict in mysql-test/r/myisam_data_pointer_size_func.result Text conflict in mysql-test/r/mysqlcheck.result Text conflict in mysql-test/r/query_cache.result Text conflict in mysql-test/r/status.result Text conflict in mysql-test/suite/binlog/r/binlog_index.result Text conflict in mysql-test/suite/binlog/r/binlog_innodb.result Text conflict in mysql-test/suite/rpl/r/rpl_packet.result Text conflict in mysql-test/suite/rpl/t/rpl_packet.test Text conflict in mysql-test/t/disabled.def Text conflict in mysql-test/t/events_bugs.test Text conflict in mysql-test/t/log_state.test Text conflict in mysql-test/t/myisam_data_pointer_size_func.test Text conflict in mysql-test/t/mysqlcheck.test Text conflict in mysql-test/t/query_cache.test Text conflict in mysql-test/t/rpl_init_slave_func.test Text conflict in mysql-test/t/status.test		2009-01-23 13:22:05 +01:00
..
disabled.def	Fix for Bug#40904 20 tests in 5.1 are disabled in a bad manner	2008-12-08 15:36:42 +01:00
loaddata_autocom_ndb.test
ndb_alter_table.test	Merging 5.1 main into 5.1-rpl	2008-10-23 21:27:09 +02:00
ndb_alter_table2.test
ndb_alter_table3.test
ndb_auto_increment.test
ndb_autoinc.test
ndb_basic.test
ndb_binlog_basic.test
ndb_binlog_ddl_multi.test
ndb_binlog_discover.test
ndb_binlog_format.test
ndb_binlog_ignore_db-master.opt
ndb_binlog_ignore_db.test
ndb_binlog_log_bin.test
ndb_binlog_multi.test
ndb_bitfield.test
ndb_blob.test
ndb_blob_partition.test
ndb_bug26793.test
ndb_bug31477.test
ndb_cache.test
ndb_cache2.test
ndb_cache_multi.test
ndb_cache_multi2.test
ndb_charset.test
ndb_condition_pushdown.test
ndb_config.test
ndb_config2.test
ndb_cursor.test
ndb_database.test
ndb_dd_alter.test
ndb_dd_basic.test
ndb_dd_ddl.test
ndb_dd_disk2memory.test
ndb_dd_dump.test
ndb_dd_sql_features.test
ndb_gis.test
ndb_grant.later
ndb_index.test
ndb_index_ordered.test
ndb_index_unique.test
ndb_insert.test
ndb_limit.test
ndb_load.test
ndb_loaddatalocal.test
ndb_lock.test
ndb_lock_table.test
ndb_minmax.test
ndb_multi.test
ndb_multi_row.test
ndb_partition_error.test
ndb_partition_error2-master.opt
ndb_partition_error2.test
ndb_partition_key.test	Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that	2008-08-11 20:02:03 +02:00
ndb_partition_list.test
ndb_partition_range.test
ndb_read_multi_range.test
ndb_rename.test
ndb_replace.test
ndb_restore.test
ndb_restore_compat.test
ndb_restore_different_endian_data.test
ndb_restore_partition-master.opt
ndb_restore_partition.test
ndb_restore_print.test	Merge 5.0 -> 5.1	2008-09-30 15:32:35 -04:00
ndb_row_format.test
ndb_single_user.test
ndb_sp.test
ndb_subquery.test
ndb_temporary.test
ndb_transaction.test
ndb_trigger.test
ndb_truncate.test
ndb_types.test
ndb_update.test
ndb_update_no_read.test
ndb_view.test
ndbapi.test
ps_7ndb.test
strict_autoinc_5ndb.test