unknown a611307811 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge ... into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1 mysql-test/r/func_time.result: Auto merged sql/item_timefunc.cc: Auto merged sql/slave.cc: Auto merged sql/sql_acl.cc: Auto merged mysql-test/t/func_time.test: Manual merge.		2006-08-21 12:55:43 -04:00
..
alias.result
alter_table.result	Bug#18775 - Temporary table from alter table visible to other threads	2006-08-03 08:12:56 +02:00
analyse.result	Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql	2006-07-30 00:33:24 +04:00
analyze.result
ansi.result
archive.result
archive_bitfield.result
archive_gis.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
auto_increment.result	BUG#14770 - LOAD DATA INFILE doesn't respect default values for	2006-08-02 17:15:50 +05:00
backup.result	Period removal for warning message.	2006-08-15 01:20:34 -07:00
bench_count_distinct.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
big_test.require
bigint.result	Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql	2006-07-30 00:33:24 +04:00
binary.result
binlog_row_binlog.result	Updated row result, and fix for Windows build.	2006-08-14 03:26:53 -07:00
binlog_row_blackhole.result	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt	2006-08-01 09:24:19 +04:00
binlog_row_ctype_cp932.result
binlog_row_ctype_ucs.result
binlog_row_drop_tmp_tbl.result
binlog_row_innodb_stat.result
binlog_row_insert_select.result
binlog_row_mix_innodb_myisam.result
binlog_stm_binlog.result	Removed bdb test cases.	2006-08-10 18:29:25 -07:00
binlog_stm_blackhole.result	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt	2006-08-01 09:24:19 +04:00
binlog_stm_ctype_cp932.result
binlog_stm_ctype_ucs.result
binlog_stm_drop_tmp_tbl.result
binlog_stm_innodb_stat.result
binlog_stm_insert_select.result
binlog_stm_mix_innodb_myisam.result
bool.result
bulk_replace.result
case.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
case_sensitive_file_system.require
cast.result	Merge bodhi.local:/opt/local/work/tmp_merge	2006-08-12 21:06:51 +04:00
check.result
check_var_limit.require
client_xml.result
comments.result
compare.result
compress.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
connect.result
consistent_snapshot.result
constraints.result
contributors.result
count_distinct.result
count_distinct2.result
count_distinct3.result
crash_commit_before.result
create.result	Merge xiphis.org:/home/antony/work2/mysql-5.0-engines	2006-08-14 21:27:36 -07:00
create_not_windows.result
create_select_tmp.result
csv.result
ctype_big5.result
ctype_collate.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
ctype_cp932_binlog_row.result
ctype_cp932_binlog_stm.result
ctype_cp1250_ch.result	Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0	2006-08-16 10:05:24 -07:00
ctype_cp1251.result
ctype_create.result
ctype_eucjpms.result
ctype_euckr.result
ctype_filename.result
ctype_gb2312.result
ctype_gbk.result
ctype_latin1.result
ctype_latin1_de.result
ctype_latin2.result
ctype_latin2_ch.result
ctype_many.result
ctype_mb.result
ctype_recoding.result
ctype_sjis.result
ctype_tis620.result
ctype_uca.result
ctype_ucs.result
ctype_ucs2_def.result
ctype_ujis.result
ctype_utf8.result	Merge bk-internal.mysql.com:/data0/bk/tmp_reg	2006-08-17 17:19:41 +02:00
date_formats.result	Merge bodhi.local:/opt/local/work/tmp_merge	2006-08-12 21:06:51 +04:00
default.result
delayed.result
delete.result
derived.result
dirty_close.result
distinct.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
drop.result
empty_table.result
endspace.result
errors.result
events.result
events_bugs.result	Manual merge 5.0->5.1. Post-merge fixes.	2006-08-14 13:27:11 +04:00
events_grant.result
events_logs_tests.result
events_microsec.result
events_scheduling.result
events_stress.result
exampledb.result
explain.result
federated.result	Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-engines	2006-08-15 09:02:53 -07:00
federated_archive.result
federated_bug_13118.result
federated_transactions.result	test result changes (non-functional) for 5.1-5.0 merge	2006-08-16 17:16:36 -07:00
flush.result
flush_block_commit.result
flush_read_lock_kill.result
flush_table.result
foreign_key.result
fulltext.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
fulltext2.result
fulltext_cache.result
fulltext_distinct.result
fulltext_left_join.result
fulltext_multi.result
fulltext_order_by.result
fulltext_update.result
fulltext_var.result
func_compress.result	Merge bodhi.local:/opt/local/work/tmp_merge	2006-08-12 21:06:51 +04:00
func_concat.result
func_crypt.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
func_date_add.result
func_default.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
func_des_encrypt.result
func_encrypt.result	BUG#14940: Post-merge fixes	2006-07-30 18:25:57 +04:00
func_encrypt_nossl.result
func_equal.result
func_gconcat.result	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt	2006-08-01 09:24:19 +04:00
func_group.result	Manual merge 5.0->5.1. Post-merge fixes.	2006-08-14 13:27:11 +04:00
func_group_innodb.result
func_if.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
func_in.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
func_isnull.result
func_like.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
func_math.result	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt	2006-08-01 09:24:19 +04:00
func_misc.result
func_op.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
func_regexp.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
func_sapdb.result
func_set.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
func_str.result	func_str.result:	2006-08-01 18:55:44 +04:00
func_system.result	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt	2006-08-01 09:24:19 +04:00
func_test.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
func_time.result	Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge	2006-08-21 12:55:43 -04:00
func_timestamp.result
gcc296.result
gis-rtree.result	Merge bodhi.local:/opt/local/work/tmp_merge	2006-08-12 21:06:51 +04:00
gis.result	Merge bk-internal.mysql.com:/data0/bk/tmp_reg	2006-08-17 17:19:41 +02:00
grant.result	Merge bk-internal.mysql.com:/data0/bk/tmp_reg	2006-08-17 17:19:41 +02:00
grant2.result	Merge zim.(none):/home/brian/mysql/dep-5.0	2006-08-14 15:24:29 -07:00
grant3.result
grant_cache.result
greedy_optimizer.result
group_by.result	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt	2006-08-01 09:24:19 +04:00
group_min_max.result	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt	2006-08-01 09:24:19 +04:00
group_min_max_innodb.result
handler.result
have_archive.require
have_big5.require
have_binlog_format_row.require
have_binlog_format_statement.require
have_blackhole.require
have_compress.require
have_cp932.require
have_cp1250_ch.require
have_crypt.require
have_csv.require
have_debug.require
have_eucjpms.require
have_euckr.require
have_exampledb.require
have_federated_db.require
have_gb2312.require
have_gbk.require
have_geometry.require
have_innodb.require
have_latin2_ch.require
have_met_timezone.require
have_moscow_leap_timezone.require
have_ndb.require
have_ndb_extra.require
have_ndb_status_ok.require
have_openssl.require
have_outfile.require
have_partition.require
have_perror.require
have_query_cache.require
have_raid.require
have_row_based.require
have_sjis.require
have_symlink.require
have_tis620.require
have_ucs2.require
have_udf.require
have_udf_example.require
have_ujis.require
having.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
heap.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
heap_auto_increment.result
heap_btree.result	Merge zim.(none):/home/brian/mysql/dep-5.0	2006-08-14 15:24:29 -07:00
heap_hash.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
help.result
im_cmd_line.result
im_daemon_life_cycle.result	Merge bodhi.local:/opt/local/work/tmp_merge	2006-08-12 21:06:51 +04:00
im_instance_conf.result
im_life_cycle.result	Merge bk-internal.mysql.com:/data0/bk/tmp_reg	2006-08-17 17:19:41 +02:00
im_options.result	Fixed warning message breakage.	2006-08-13 22:28:41 -07:00
im_utils.result	Merge zim.(none):/home/brian/mysql/dep-5.1	2006-08-14 21:26:33 -07:00
index_merge.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
index_merge_innodb.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
index_merge_innodb2.result
index_merge_ror.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
index_merge_ror_cpk.result
information_schema.result	After merge fix	2006-08-01 08:49:43 +04:00
information_schema_chmod.result
information_schema_db.result	Merge bk-internal.mysql.com:/data0/bk/tmp_reg	2006-08-17 17:19:41 +02:00
information_schema_inno.result
information_schema_part.result
init_connect.result
init_file.result
innodb-big.result
innodb-deadlock.result
innodb-lock.result
innodb-replace.result
innodb.result	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1	2006-08-02 02:19:46 +04:00
innodb_cache.result
innodb_concurrent.result
innodb_gis.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
innodb_handler.result
innodb_mysql.result	Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql	2006-07-30 00:33:24 +04:00
innodb_notembedded.result
innodb_unsafe_binlog.result
insert.result	BUG#14770 - LOAD DATA INFILE doesn't respect default values for	2006-08-02 17:15:50 +05:00
insert_select.result	Merge xiphis.org:/home/antony/work2/mysql-5.0-engines	2006-08-14 21:27:36 -07:00
insert_update.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
is_debug_build.require
isam.result
join.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
join_crash.result
join_nested.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
join_outer.result	Merge bodhi.local:/opt/local/work/tmp_merge	2006-08-12 21:06:51 +04:00
join_outer_innodb.result
key.result	BUG#14770 - LOAD DATA INFILE doesn't respect default values for	2006-08-02 17:15:50 +05:00
key_cache.result
key_diff.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
key_primary.result
keywords.result
kill.result
limit.result
loaddata.result
lock.result
lock_multi.result
lock_tables_lost_commit.result
log_state.result
log_tables.result	Fixed warning message breakage.	2006-08-13 22:28:41 -07:00
lowercase0.require
lowercase2.require
lowercase_fs_off.result
lowercase_table.result
lowercase_table2.result
lowercase_table3.result
lowercase_table_grant.result
lowercase_table_qcache.result
lowercase_view.result
merge.result	Merge govinda.patg.net:/home/patg/mysql-build/mysql-5.0-holyfoot	2006-08-08 09:01:32 -07:00
metadata.result
multi_statement.result
multi_update.result	Updated row result, and fix for Windows build.	2006-08-14 03:26:53 -07:00
myisam-blob.result
myisam-system.result
myisam.result	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt	2006-08-01 09:24:19 +04:00
mysql.result	Disable test case for for bug 21042	2006-08-02 08:46:58 +02:00
mysql_client.result	Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328	2006-08-16 19:31:33 -04:00
mysql_client_test.result
mysql_protocols.result
mysqlbinlog.result
mysqlbinlog2.result
mysqlbinlog_base64.result
mysqlcheck.result	Manual merge 5.0->5.1. Post-merge fixes.	2006-08-14 13:27:11 +04:00
mysqldump-max.result	Merge rama.(none):/home/jimw/my/tmp_merge	2006-07-28 15:51:48 -07:00
mysqldump.result	Merge fixes	2006-08-14 16:50:52 -07:00
mysqlshow.result	Manual merge 5.0->5.1. Post-merge fixes.	2006-08-14 13:27:11 +04:00
mysqlslap.result
mysqltest.result	Manual merge 5.0->5.1. Post-merge fixes.	2006-08-14 13:27:11 +04:00
ndb_alter_table.result
ndb_alter_table2.result
ndb_alter_table3.result
ndb_autodiscover.result
ndb_autodiscover2.result
ndb_autodiscover3.result
ndb_basic.result	Manual merge 5.0->5.1. Post-merge fixes.	2006-08-14 13:27:11 +04:00
ndb_binlog_basic.result
ndb_binlog_basic2.result
ndb_binlog_ddl_multi.result
ndb_binlog_discover.result
ndb_binlog_ignore_db.result
ndb_binlog_multi.result
ndb_bitfield.result
ndb_blob.result
ndb_blob_partition.result
ndb_cache.result
ndb_cache2.result
ndb_cache_multi.result
ndb_cache_multi2.result
ndb_charset.result
ndb_condition_pushdown.result
ndb_config.result
ndb_config2.result
ndb_database.result
ndb_dd_advance.result
ndb_dd_advance2.result
ndb_dd_backuprestore.result
ndb_dd_basic.result
ndb_dd_ddl.result
ndb_dd_disk2memory.result
ndb_dd_dump.result
ndb_default_cluster.require
ndb_gis.result	BUG#14940: Post-merge fixes	2006-07-30 18:25:57 +04:00
ndb_grant.result
ndb_index.result
ndb_index_ordered.result
ndb_index_unique.result
ndb_insert.result
ndb_limit.result
ndb_load.result
ndb_loaddatalocal.result
ndb_lock.result	bug #18184 SELECT ... FOR UPDATE does not work..: Updated test result file	2006-08-15 15:49:31 +02:00
ndb_minmax.result
ndb_multi.result
ndb_multi_row.result
ndb_partition_error.result
ndb_partition_key.result
ndb_partition_list.result
ndb_partition_range.result
ndb_read_multi_range.result
ndb_rename.result
ndb_replace.result
ndb_restore.result
ndb_restore_compat.result
ndb_restore_partition.result
ndb_subquery.result
ndb_temporary.result
ndb_transaction.result
ndb_trigger.result
ndb_truncate.result
ndb_types.result
ndb_update.result
ndb_view.result
negation_elimination.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
not_as_root.require
not_embedded.require
not_embedded_server.result
not_ndb.require
not_ndb_default.require
not_openssl.require
not_row_based.require
not_windows.require
null.result	BUG#14770 - LOAD DATA INFILE doesn't respect default values for	2006-08-02 17:15:50 +05:00
null_key.result	BUG#14770 - LOAD DATA INFILE doesn't respect default values for	2006-08-02 17:15:50 +05:00
odbc.result
olap.result	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt	2006-08-01 09:24:19 +04:00
openssl_1.result
openssl_2.result
order_by.result
order_fill_sortbuf.result
outfile.result
overflow.result
packet.result
partition.result
partition_02myisam.result
partition_03ndb.result
partition_charset.result
partition_error.result
partition_grant.result	Fix a test suite failure.	2006-08-14 19:05:35 +04:00
partition_hash.result
partition_innodb.result
partition_list.result
partition_mgm.result
partition_mgm_err.result
partition_mgm_err2.result
partition_order.result
partition_pruning.result	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt	2006-08-01 09:24:19 +04:00
partition_range.result
perror.result	Change error code to test for "unknown error" with to 10000	2006-08-01 11:29:10 +02:00
preload.result
ps.result	A post-merge fix.	2006-08-02 19:39:47 +04:00
ps_1general.result	Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge	2006-08-10 16:11:55 +04:00
ps_2myisam.result	Merge xiphis.org:/home/antony/work2/mysql-5.0-engines	2006-08-14 21:27:36 -07:00
ps_3innodb.result	Merge xiphis.org:/home/antony/work2/mysql-5.0-engines	2006-08-14 21:27:36 -07:00
ps_4heap.result	Merge xiphis.org:/home/antony/work2/mysql-5.0-engines	2006-08-14 21:27:36 -07:00
ps_5merge.result	Merge xiphis.org:/home/antony/work2/mysql-5.0-engines	2006-08-14 21:27:36 -07:00
ps_7ndb.result	Merge xiphis.org:/home/antony/work2/mysql-5.0-engines	2006-08-14 21:27:36 -07:00
ps_10nestset.result
ps_11bugs.result
ps_grant.result
query_cache.result	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt	2006-08-01 09:24:19 +04:00
query_cache_merge.result
query_cache_notembedded.result
raid.result
range.result
read_only.result
rename.result
renamedb.result
repair.result	Merge fixes	2006-08-14 16:50:52 -07:00
replace.result
rollback.result
row.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
rowid_order_innodb.result
rpl000001.a.result
rpl000001.b.result
rpl000010.result
rpl000011.result
rpl000013.result
rpl000017.result
rpl_000015.result
rpl_alter.result
rpl_alter_db.result
rpl_auto_increment.result
rpl_auto_increment_11932.result
rpl_bit.result
rpl_bit_npk.result
rpl_change_master.result
rpl_commit_after_flush.result
rpl_create_database.result
rpl_ddl.result
rpl_deadlock_innodb.result
rpl_delete_no_where.result
rpl_do_grant.result
rpl_drop.result
rpl_drop_db.result
rpl_drop_temp.result
rpl_dual_pos_advance.result
rpl_EE_err.result
rpl_empty_master_crash.result
rpl_err_ignoredtable.result
rpl_failed_optimize.result
rpl_flushlog_loop.result
rpl_foreign_key_innodb.result
rpl_free_items.result
rpl_get_lock.result	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt	2006-08-01 09:24:19 +04:00
rpl_ignore_grant.result
rpl_ignore_revoke.result
rpl_ignore_table.result
rpl_ignore_table_update.result
rpl_init_slave.result
rpl_innodb.result
rpl_insert.result
rpl_insert_id.result	After merge fix	2006-08-01 08:49:43 +04:00
rpl_insert_id_pk.result
rpl_insert_ignore.result
rpl_insert_select.result
rpl_LD_INFILE.result
rpl_load_from_master.result
rpl_load_table_from_master.result
rpl_loaddata.result
rpl_loaddata2.result
rpl_loaddata_m.result
rpl_loaddata_s.result
rpl_loaddatalocal.result
rpl_loadfile.result
rpl_log_pos.result
rpl_many_optimize.result
rpl_master_pos_wait.result	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt	2006-08-01 09:24:19 +04:00
rpl_misc_functions.result
rpl_mixed_ddl_dml.result
rpl_multi_delete.result
rpl_multi_delete2.result
rpl_multi_engine.result
rpl_multi_update.result
rpl_multi_update2.result
rpl_multi_update3.result
rpl_multi_update4.result
rpl_ndb_2innodb.result
rpl_ndb_2myisam.result
rpl_ndb_auto_inc.result
rpl_ndb_bank.result
rpl_ndb_basic.result
rpl_ndb_blob.result
rpl_ndb_blob2.result
rpl_ndb_charset.result
rpl_ndb_commit_afterflush.result
rpl_ndb_dd_advance.result
rpl_ndb_dd_basic.result
rpl_ndb_dd_partitions.result
rpl_ndb_ddl.result
rpl_ndb_delete_nowhere.result
rpl_ndb_func003.result
rpl_ndb_idempotent.result
rpl_ndb_insert_ignore.result
rpl_ndb_load.result
rpl_ndb_log.result
rpl_ndb_multi.result
rpl_ndb_multi_update2.result
rpl_ndb_multi_update3.result
rpl_ndb_relayrotate.result
rpl_ndb_row_001.result
rpl_ndb_sp003.result
rpl_ndb_sp006.result
rpl_ndb_sync.result
rpl_ndb_trig004.result
rpl_ndb_UUID.result
rpl_openssl.result
rpl_optimize.result
rpl_ps.result
rpl_rbr_to_sbr.result
rpl_redirect.result
rpl_relay_space_innodb.result
rpl_relay_space_myisam.result
rpl_relayrotate.result
rpl_relayspace.result
rpl_replicate_do.result
rpl_replicate_ignore_db.result
rpl_rewrt_db.result
rpl_rotate_logs.result
rpl_row_001.result
rpl_row_4_bytes.result
rpl_row_basic_2myisam.result
rpl_row_basic_3innodb.result
rpl_row_basic_7ndb.result
rpl_row_basic_8partition.result
rpl_row_basic_11bugs.result
rpl_row_blob_innodb.result
rpl_row_blob_myisam.result
rpl_row_charset.result
rpl_row_create_table.result
rpl_row_delayed_ins.result
rpl_row_drop.result
rpl_row_err_ignoredtable.result
rpl_row_flsh_tbls.result
rpl_row_func001.result
rpl_row_func002.result
rpl_row_func003.result
rpl_row_inexist_tbl.result
rpl_row_loaddata_m.result
rpl_row_log.result
rpl_row_log_innodb.result
rpl_row_max_relay_size.result
rpl_row_multi_query.result
rpl_row_mysqlbinlog.result
rpl_row_mystery22.result
rpl_row_NOW.result
rpl_row_reset_slave.result
rpl_row_sp001.result
rpl_row_sp002_innodb.result
rpl_row_sp003.result
rpl_row_sp005.result
rpl_row_sp006_InnoDB.result
rpl_row_sp007_innodb.result
rpl_row_sp008.result
rpl_row_sp009.result
rpl_row_sp010.result
rpl_row_sp011.result
rpl_row_sp012.result
rpl_row_stop_middle.result
rpl_row_stop_middle_update.result
rpl_row_tabledefs.result
rpl_row_trig001.result
rpl_row_trig002.result
rpl_row_trig003.result
rpl_row_trig004.result
rpl_row_until.result
rpl_row_USER.result
rpl_row_UUID.result
rpl_row_view01.result
rpl_server_id1.result
rpl_server_id2.result
rpl_session_var.result
rpl_set_charset.result
rpl_skip_error.result
rpl_slave_status.result
rpl_sp.result	Merge bodhi.local:/opt/local/work/tmp_merge	2006-08-12 21:06:51 +04:00
rpl_sp004.result
rpl_sp_effects.result
rpl_sporadic_master.result
rpl_start_stop_slave.result
rpl_stm_000001.result
rpl_stm_charset.result
rpl_stm_EE_err2.result
rpl_stm_flsh_tbls.result
rpl_stm_log.result
rpl_stm_max_relay_size.result
rpl_stm_multi_query.result
rpl_stm_mystery22.result
rpl_stm_no_op.result
rpl_stm_reset_slave.result
rpl_stm_until.result
rpl_switch_stm_row_mixed.result	Manual merge 5.0->5.1. Post-merge fixes.	2006-08-14 13:27:11 +04:00
rpl_temp_table.result
rpl_temporary.result
rpl_timezone.result
rpl_trigger.result	Merge bodhi.local:/opt/local/work/tmp_merge	2006-08-12 21:06:51 +04:00
rpl_trunc_temp.result
rpl_truncate_2myisam.result
rpl_truncate_3innodb.result
rpl_truncate_7ndb.result
rpl_truncate_7ndb_2.result
rpl_user_variables.result
rpl_variables.result
rpl_view.result	Manual merge 5.0->5.1. Post-merge fixes.	2006-08-14 13:27:11 +04:00
schema.result
select.result	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt	2006-08-01 09:24:19 +04:00
select_found.result
select_safe.result
server_id.require
server_id1.require
show_check.result	Merge zim.(none):/home/brian/mysql/dep-5.1	2006-08-14 21:26:33 -07:00
skip_grants.result
skip_name_resolve.result
slave-running.result
slave-stopped.result
sp-big.result
sp-code.result
sp-destruct.result
sp-dynamic.result
sp-error.result	Manual merge 5.0->5.1. Post-merge fixes.	2006-08-14 13:27:11 +04:00
sp-prelocking.result
sp-security.result	Manual merge 5.0->5.1. Post-merge fixes.	2006-08-14 13:27:11 +04:00
sp-threads.result
sp-vars.result
sp.result	Manual merge 5.0->5.1. Post-merge fixes.	2006-08-14 13:27:11 +04:00
sp_notembedded.result
sp_trans.result	Fixed warning message breakage.	2006-08-13 22:28:41 -07:00
sql_mode.result
ssl.result	BUG#14940: Post-merge fixes	2006-07-30 18:25:57 +04:00
ssl_compress.result	BUG#14940: Post-merge fixes	2006-07-30 18:25:57 +04:00
status.result
strict.result	Merge xiphis.org:/home/antony/work2/mysql-5.0-engines	2006-08-14 21:27:36 -07:00
subselect.result	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt	2006-08-01 09:24:19 +04:00
subselect2.result
subselect_gis.result
subselect_innodb.result
subselect_notembedded.result
sum_distinct-big.result
sum_distinct.result
symlink.result
synchronization.result
sysdate_is_now.result
system_mysql_db.result
system_mysql_db_refs.result
tablelock.result
temp_table.result
testdb_only.require
timezone.result
timezone2.result
timezone3.result
timezone_grant.result
trigger-compat.result
trigger-grant.result
trigger-trans.result
trigger.result
truncate.result
type_binary.result
type_bit.result
type_bit_innodb.result
type_blob.result	Merge bodhi.local:/opt/local/work/tmp_merge	2006-08-12 21:06:51 +04:00
type_date.result
type_datetime.result	Manual merge 5.0->5.1. Post-merge fixes.	2006-08-14 13:27:11 +04:00
type_decimal.result
type_enum.result
type_float.result
type_nchar.result
type_newdecimal-big.result
type_newdecimal.result	Merge bk-internal.mysql.com:/data0/bk/tmp_reg	2006-08-17 17:19:41 +02:00
type_ranges.result	Merge bk-internal.mysql.com:/data0/bk/tmp_reg	2006-08-17 17:19:41 +02:00
type_set.result
type_time.result
type_timestamp.result	Merge bk-internal.mysql.com:/data0/bk/tmp_reg	2006-08-17 17:19:41 +02:00
type_uint.result
type_varchar.result
type_year.result
udf.result	Merge bodhi.local:/opt/local/work/tmp_merge	2006-08-12 21:06:51 +04:00
union.result	Manual merge 5.0->5.1. Post-merge fixes.	2006-08-14 13:27:11 +04:00
update.result
upgrade.result
user_limits.result
user_var-binlog.result
user_var.result	Merge bodhi.local:/opt/local/work/tmp_merge	2006-08-12 21:06:51 +04:00
varbinary.result	BUG#14940 "MySQL choose wrong index", v.2	2006-07-28 21:27:01 +04:00
variables.result	Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt	2006-08-01 09:24:19 +04:00
view.result	Merge xiphis.org:/home/antony/work2/mysql-5.0-engines	2006-08-14 21:27:36 -07:00
view_grant.result
view_query_cache.result
wait_timeout.result
warnings.result	merge warning test results (!)	2006-08-16 20:39:33 -07:00
windows.require
windows.result
xa.result
xml.result