Luis Soares 16a6158c47 merge: 5.1 -> 5.1-rpl-merge ... conflicts: Text conflict in mysql-test/suite/sys_vars/r/rpl_max_binlog_size_func.result Text conflict in mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func.test		2009-01-29 17:59:46 +01:00
..
add_anonymous_users.inc
analyze-sync_with_master.test	Bug #38181 Please print more debug info when tests fail	2008-08-04 21:54:44 +02:00
analyze-timeout.test	WL#4350 Add missing 'exit'	2008-09-09 09:49:58 +02:00
big_test.inc
check-testcase.test	Merge 5.0->5.1	2008-11-24 16:56:48 -05:00
check-warnings.test	WL#4189 mtr.pl v2	2009-01-27 21:14:23 +01:00
check_events_off.inc	1. Fix for Bug#41111 events_bugs fails sporadically on pushbuild	2009-01-09 15:10:03 +01:00
check_var_limit.inc
circular_rpl_for_4_hosts_init.inc
circular_rpl_for_4_hosts_sync.inc
cleanup_fake_relay_log.inc	BUG#40482: server/mysqlbinlog crashes when reading invalid Incident_log_event	2008-12-29 17:04:10 +01:00
commit.inc	merge: 5.1 -> 5.1-rpl	2009-01-23 13:22:05 +01:00
common-tests.inc
concurrent.inc	Bug#21579 - innodb_concurrent random failures with varying differences	2008-08-15 14:48:14 -04:00
connect2.inc
ctype_common.inc
ctype_filesort.inc
ctype_german.inc
ctype_innodb_like.inc
ctype_like_escape.inc
ctype_like_range_f1f2.inc
ctype_regex.inc
ddl_i18n.check_events.inc
ddl_i18n.check_sp.inc
ddl_i18n.check_triggers.inc
ddl_i18n.check_views.inc
deadlock.inc
default_my.cnf
default_mysqld.cnf
default_ndbd.cnf	Bug#39849 ndb tests fail sporadically on pushbuild: "out of connection objects"	2009-01-29 15:22:02 +01:00
delete_anonymous_users.inc
diff_tables.inc
endspace.inc
get_binlog_dump_thread_id.inc
gis_generic.inc
gis_keys.inc
grant_cache.inc	Bug#36086: SELECT * from views don't check column grants	2008-09-03 16:45:40 +02:00
handler.inc
have_32bit.inc	Patch for bug#36875: Inserted review results.	2009-01-08 19:13:57 +01:00
have_64bit.inc	Patch for bug#36875: Inserted review results.	2009-01-08 19:13:57 +01:00
have_archive.inc	Bug#30563: Is not possible to create rpl_ or innodb test if needed \	2008-07-04 12:41:27 -04:00
have_big5.inc	Bug#30563: Is not possible to create rpl_ or innodb test if needed \	2008-07-04 12:41:27 -04:00
have_binlog_format_mixed.inc	Merge from 5.0. Add new 5.1 files. Drop bdb.	2008-07-04 14:48:25 -04:00
have_binlog_format_mixed_or_row.inc	Merge from 5.0. Add new 5.1 files. Drop bdb.	2008-07-04 14:48:25 -04:00
have_binlog_format_mixed_or_statement.inc	Merge from 5.0. Add new 5.1 files. Drop bdb.	2008-07-04 14:48:25 -04:00
have_binlog_format_row.inc	Merge from 5.0. Add new 5.1 files. Drop bdb.	2008-07-04 14:48:25 -04:00
have_binlog_format_row_or_statement.inc	Merge from 5.0. Add new 5.1 files. Drop bdb.	2008-07-04 14:48:25 -04:00
have_binlog_format_statement.inc	Merge from 5.0. Add new 5.1 files. Drop bdb.	2008-07-04 14:48:25 -04:00
have_blackhole.inc	Bug#30563: Is not possible to create rpl_ or innodb test if needed \	2008-07-04 12:41:27 -04:00
have_case_insensitive_file_system.inc	Bug#37402: Mysql cant read partitioned table with capital letter in the name	2008-07-11 01:14:13 +02:00
have_case_sensitive_file_system.inc	Bug#30563: Is not possible to create rpl_ or innodb test if needed \	2008-07-04 12:41:27 -04:00
have_community_features.inc	Merge from 5.0. Add new 5.1 files. Drop bdb.	2008-07-04 14:48:25 -04:00
have_compress.inc	Bug#30563: Is not possible to create rpl_ or innodb test if needed \	2008-07-04 12:41:27 -04:00
have_cp866.inc
have_cp932.inc	Bug#30563: Is not possible to create rpl_ or innodb test if needed \	2008-07-04 12:41:27 -04:00
have_cp1250_ch.inc	Bug#30563: Is not possible to create rpl_ or innodb test if needed \	2008-07-04 12:41:27 -04:00
have_cp1251.inc
have_crypt.inc	Bug#30563: Is not possible to create rpl_ or innodb test if needed \	2008-07-04 12:41:27 -04:00
have_csv.inc	Bug#30563: Is not possible to create rpl_ or innodb test if needed \	2008-07-04 12:41:27 -04:00
have_debug.inc	Merge from 5.0. Add new 5.1 files. Drop bdb.	2008-07-04 14:48:25 -04:00
have_eucjpms.inc	Bug#30563: Is not possible to create rpl_ or innodb test if needed \	2008-07-04 12:41:27 -04:00
have_euckr.inc	Bug#30563: Is not possible to create rpl_ or innodb test if needed \	2008-07-04 12:41:27 -04:00
have_example_plugin.inc	Merge from 5.0. Add new 5.1 files. Drop bdb.	2008-07-04 14:48:25 -04:00
have_exampledb.inc	Bug#30563: Is not possible to create rpl_ or innodb test if needed \	2008-07-04 12:41:27 -04:00
have_gb2312.inc	Bug#30563: Is not possible to create rpl_ or innodb test if needed \	2008-07-04 12:41:27 -04:00
have_gbk.inc	Bug#30563: Is not possible to create rpl_ or innodb test if needed \	2008-07-04 12:41:27 -04:00
have_geometry.inc	Bug#30563: Is not possible to create rpl_ or innodb test if needed \	2008-07-04 12:41:27 -04:00
have_innodb.inc	Bug#30563: Is not possible to create rpl_ or innodb test if needed \	2008-07-04 12:41:27 -04:00
have_koi8r.inc
have_latin2_ch.inc	Bug#30563: Is not possible to create rpl_ or innodb test if needed \	2008-07-04 12:41:27 -04:00
have_local_infile.inc
have_log_bin.inc	merged 5.1 main to 5.1-rpl	2008-08-04 07:04:47 +02:00
have_lowercase0.inc	Bug#37402: Mysql cant read partitioned table with capital letter in the name	2008-07-11 01:14:13 +02:00
have_lowercase1.inc
have_lowercase2.inc	Bug#37402: Mysql cant read partitioned table with capital letter in the name	2008-07-11 01:14:13 +02:00
have_multi_ndb.inc	Bug#30563: Is not possible to create rpl_ or innodb test if needed \	2008-07-04 12:41:27 -04:00
have_ndb.inc	Bug#30563: Is not possible to create rpl_ or innodb test if needed \	2008-07-04 12:41:27 -04:00
have_ndb_extra.inc
have_ndbapi_examples.inc	merged 5.1 main to 5.1-rpl	2008-08-04 07:04:47 +02:00
have_outfile.inc	Merge from 5.0. Add new 5.1 files. Drop bdb.	2008-07-04 14:48:25 -04:00
have_partition.inc	Merge from 5.0. Add new 5.1 files. Drop bdb.	2008-07-04 14:48:25 -04:00
have_query_cache.inc	Merge from 5.0. Add new 5.1 files. Drop bdb.	2008-07-04 14:48:25 -04:00
have_simple_parser.inc	BUG#39746 - Debug flag breaks struct definition	2008-12-17 17:24:34 +04:00
have_sjis.inc	Bug#30563: Is not possible to create rpl_ or innodb test if needed \	2008-07-04 12:41:27 -04:00
have_ssl.inc	Bug#30563: Is not possible to create rpl_ or innodb test if needed \	2008-07-04 12:41:27 -04:00
have_symlink.inc	Merge from 5.0. Add new 5.1 files. Drop bdb.	2008-07-04 14:48:25 -04:00
have_tis620.inc	Bug#30563: Is not possible to create rpl_ or innodb test if needed \	2008-07-04 12:41:27 -04:00
have_ucs2.inc	Bug#30563: Is not possible to create rpl_ or innodb test if needed \	2008-07-04 12:41:27 -04:00
have_udf.inc	Merge from 5.0. Add new 5.1 files. Drop bdb.	2008-07-04 14:48:25 -04:00
have_ujis.inc	Bug#30563: Is not possible to create rpl_ or innodb test if needed \	2008-07-04 12:41:27 -04:00
have_utf8.inc
index_merge1.inc	Merge: mysql-5.0-bugteam -> mysql-5.1-bugteam	2008-12-23 16:28:13 +03:00
index_merge2.inc
index_merge_2sweeps.inc
index_merge_ror.inc
index_merge_ror_cpk.inc
innodb_rollback_on_timeout.inc
innodb_trx_weight.inc
is_embedded.inc
linux_sys_vars.inc	Fix for Bug#36876:	2008-12-02 11:05:56 +01:00
load_sysvars.inc
loaddata_autocom.inc
master-slave-end.inc
master-slave-reset.inc	BUG#37733: rpl.rpl_flushlog_loop 'row' fails sporadically on pushbuild	2008-07-15 12:01:54 +02:00
master-slave.inc
mix1.inc	Merging 5.1 main into 5.1-rpl	2008-10-23 21:27:09 +02:00
mix2.inc
mix2_ucs2.inc
mtr_check.sql
mtr_warnings.sql	WL#4189 mtr.pl v2	2009-01-27 14:53:58 +01:00
mysqlbinlog_row_engine.inc	Postfix of tests after merge	2008-09-06 12:49:43 +08:00
mysqltest-x.inc	Bug #38181 Please print more debug info when tests fail	2008-08-04 21:54:44 +02:00
ndb_backup.inc
ndb_backup_print.inc	Bug#38311 Some tests use 'rm' which is not portable	2008-09-20 02:21:28 -04:00
ndb_default_cluster.inc
ndb_master-slave.inc
ndb_master-slave_2ch.inc
ndb_not_readonly.inc
ndb_restore_master.inc
ndb_restore_slave_eoption.inc
ndb_setup_slave.inc
ndb_wait_connected.inc
no_running_event_scheduler.inc	1. Fix for Bug#41111 events_bugs fails sporadically on pushbuild	2009-01-09 15:10:03 +01:00
no_running_events.inc	1. Fix for Bug#41111 events_bugs fails sporadically on pushbuild	2009-01-09 15:10:03 +01:00
not_as_root.inc	Bug #32307 mysqltest - does not detect illegal if syntax	2008-08-04 12:38:50 +02:00
not_embedded.inc
not_ndb.inc
not_ndb_default.inc
not_openssl.inc
not_valgrind.inc
not_windows.inc
one_thread_per_connection.inc
parser_bug21114.inc
ps_conv.inc
ps_create.inc
ps_ddl_1.inc	Improve the testcases for Bug 12093 in ps_ddl.test	2008-08-13 21:42:21 +02:00
ps_modify.inc
ps_modify1.inc
ps_query.inc
ps_renew.inc
query_cache.inc	BUG#38350: Many tests don't clean up after themselves on exit.	2008-11-13 20:19:00 +01:00
query_cache_sql_prepare.inc
read_many_rows.inc
report-features.test	Change typo . -> ,	2008-09-20 17:00:05 +03:00
reset_master_and_slave.inc	BUG#37975: wait_for_slave_* should increase the timeout	2008-07-10 18:09:39 +02:00
restart_mysqld.inc	BUG#40704 main.events_restart fails sporadically in pushbuild: "server has gone away"	2008-12-25 17:53:24 +08:00
rowid_order.inc
rpl_events.inc
rpl_multi_engine.inc	BUG#40707 rpl_multi_engine fails sporadically in pushbuild	2008-11-24 14:57:23 +08:00
rpl_multi_engine2.inc
rpl_multi_engine3.inc
rpl_stmt_seq.inc
rpl_udf.inc
running_event_scheduler.inc	1. Fix for Bug#41111 events_bugs fails sporadically on pushbuild	2009-01-09 15:10:03 +01:00
safe_set_to_maybe_ro_var.inc
select_ndb_apply_status.inc
set_binlog_format_mixed.sql
set_binlog_format_row.sql
set_binlog_format_statement.sql
setup_fake_relay_log.inc	BUG#40482: server/mysqlbinlog crashes when reading invalid Incident_log_event	2008-12-29 17:04:10 +01:00
show_binary_logs.inc
show_binlog_events.inc	BUG#38178: rpl_loaddata_map fails sporadically in pushbuild	2008-07-18 13:34:19 +02:00
show_binlog_events2.inc
show_binlog_using_logname.inc
show_master_logs.inc
show_master_status.inc
show_msg.inc
show_msg80.inc
show_rpl_debug_info.inc	BUG#37718: rpl.rpl_stm_mystery22 fails sporadically on pushbuild	2009-01-09 15:12:31 +01:00
show_slave_status.inc
show_slave_status2.inc
sp-vars.inc
start_slave.inc	BUG#37718: rpl.rpl_stm_mystery22 fails sporadically on pushbuild	2009-01-09 15:12:31 +01:00
stop_slave.inc	BUG#37718: rpl.rpl_stm_mystery22 fails sporadically on pushbuild	2009-01-09 15:12:31 +01:00
strict_autoinc.inc
sync_slave_io_with_master.inc	BUG#37718: rpl.rpl_stm_mystery22 fails sporadically on pushbuild	2009-01-09 15:12:31 +01:00
system_db_struct.inc
test_fieldsize.inc
test_outfile.inc
testdb_only.inc
tpcb.inc
tpcb_disk_data.inc
unsafe_binlog.inc
uses_vardir.inc
varchar.inc
wait_condition.inc
wait_condition_sp.inc	Final fix for bug#36773: Moved patch in 5.1 from rpl to bug team tree.	2008-12-17 14:38:02 +01:00
wait_for_binlog_event.inc
wait_for_query_to_suceed.inc
wait_for_slave_io_to_start.inc	BUG#37718: rpl.rpl_stm_mystery22 fails sporadically on pushbuild	2009-01-09 15:12:31 +01:00
wait_for_slave_io_to_stop.inc	BUG#37718: rpl.rpl_stm_mystery22 fails sporadically on pushbuild	2009-01-09 15:12:31 +01:00
wait_for_slave_param.inc	BUG#37718: rpl.rpl_stm_mystery22 fails sporadically on pushbuild	2009-01-09 15:12:31 +01:00
wait_for_slave_sql_error.inc	BUG#37718: rpl.rpl_stm_mystery22 fails sporadically on pushbuild	2009-01-09 15:12:31 +01:00
wait_for_slave_sql_error_and_skip.inc	BUG#37718: rpl.rpl_stm_mystery22 fails sporadically on pushbuild	2009-01-09 15:12:31 +01:00
wait_for_slave_sql_to_start.inc	BUG#37718: rpl.rpl_stm_mystery22 fails sporadically on pushbuild	2009-01-09 15:12:31 +01:00
wait_for_slave_sql_to_stop.inc	BUG#37718: rpl.rpl_stm_mystery22 fails sporadically on pushbuild	2009-01-09 15:12:31 +01:00
wait_for_slave_to_start.inc	BUG#37718: rpl.rpl_stm_mystery22 fails sporadically on pushbuild	2009-01-09 15:12:31 +01:00
wait_for_slave_to_stop.inc	BUG#37718: rpl.rpl_stm_mystery22 fails sporadically on pushbuild	2009-01-09 15:12:31 +01:00
wait_until_connected_again.inc	push to 5.1-buteam tree.	2008-12-10 10:51:43 +00:00
wait_until_disconnected.inc	Bug #40704 main.events_restart fails sporadically in pushbuild: "server has gone away"	2008-12-19 16:48:31 +01:00
wait_until_rows_count.inc
windows.inc
windows_sys_vars.inc	Fix for Bug#36876:	2008-12-02 11:05:56 +01:00