mariadb/mysql-test/r
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
..
1st.result Add mtr database 2008-04-02 10:06:36 +02:00
alias.result
almost_full.result Bug #31305 myisam tables crash when they are near capacity. 2007-11-12 13:00:22 +04:00
alter_table-big.result Patch changing how ALTER TABLE implementation handles table locking 2007-05-19 10:49:56 +04:00
alter_table.result 5.0-bugteam->5.1-bugteam merge 2008-12-09 17:31:22 +04:00
analyse.result sp.result, analyse.result: 2007-05-30 20:25:16 +04:00
analyze.result Fix for bug #30495: optimize table t1,t2,t3 extended errors 2007-11-21 11:11:22 +04:00
ansi.result
archive-big.result BUG#15787 - MySQL crashes when archive table exceeds 2GB 2007-06-24 19:44:54 +05:00
archive.result Add missing DROP TABLE 2008-03-14 17:59:03 +01:00
archive_bitfield.result
archive_gis.result Bug #27531: 5.1 part of the fix 2007-05-29 15:58:18 +03:00
auto_increment.result Bug#38338: REPLACE causes last_insert_id() to return an incorrect value 2008-09-16 18:37:59 +05:30
backup.result WL#4189 2007-12-12 18:19:24 +01:00
bench_count_distinct.result
big_test.require
bigint.result Merge mysql.com:/home/kent/bk/bug30069/mysql-5.0-build 2007-11-12 14:09:57 +01:00
binary.result Merge olga.mysql.com:/home/igor/mysql-5.0-opt 2007-06-30 20:49:28 -07:00
binlog_tx_isolation.result BUG#23051 (READ COMMITTED breaks mixed and statement-based replication): 2007-06-14 13:33:31 +02:00
bool.result
bootstrap.result
bulk_replace.result
cache_innodb.result BUG#38350: Many tests don't clean up after themselves on exit. 2008-11-13 20:19:00 +01:00
case.result Fix for Bug#32538: View definition picks up character set, 2008-02-12 22:09:16 +03:00
case_insensitive_file_system.require Bug#37402: Mysql cant read partitioned table with capital letter in the name 2008-07-11 01:14:13 +02:00
case_sensitive_file_system.require
cast.result Bug#31990: MINUTE() and SECOND() return bogus results when used on a DATE 2007-12-11 10:12:05 +01:00
change_user.result Fix for bug #34650: Test suite without cluster fails on Mac OS X 2008-03-07 21:14:34 +03:00
check.result Merge mysql.com:/home/svoj/devel/mysql/BUG26325/mysql-5.0-engines 2007-07-19 15:54:31 +05:00
check_var_limit.require
client_xml.result merge of 38158 to 5.1-bugteam 2008-07-18 15:00:45 +03:00
comments.result Manual merge of bug#26030 in mysql-5.1-bugteam 2008-07-07 15:53:20 -06:00
commit_1innodb.result merge: 5.1 -> 5.1-rpl 2009-01-23 13:22:05 +01:00
compare.result merge of bug 39353 5.0-5.1.29-rc -> 5.1-5.1.29-rc 2008-09-19 15:34:37 +03:00
compress.result Fix for Bug#32538: View definition picks up character set, 2008-02-12 22:09:16 +03:00
concurrent_innodb_safelog.result Bug#21579 - innodb_concurrent random failures with varying differences 2008-08-15 14:48:14 -04:00
concurrent_innodb_unsafelog.result Bug#21579 - innodb_concurrent random failures with varying differences 2008-08-15 14:48:14 -04:00
connect.result Avoid races in connect.test. 2008-03-17 14:26:00 +03:00
consistent_snapshot.result
constraints.result
contributors.result
count_distinct.result
count_distinct2.result
count_distinct3.result
crash_commit_before.result
create-big.result 5.1 version of fix for: 2007-05-23 15:26:16 +04:00
create.result merge: 5.1 -> 5.1-rpl 2009-01-23 13:22:05 +01:00
create_not_windows.result Bug 29325: moved the test from create_not_windows to symlink. 2007-07-13 13:56:22 +03:00
create_select_tmp.result
csv.result merge: 5.1 -> 5.1-rpl 2009-01-23 13:22:05 +01:00
csv_alter_table.result Bug#33970 Test main.csv_alter_table disabled. 2008-11-17 15:25:27 -05:00
csv_not_null.result Bug#34468 - csv_not_null fails 2008-02-14 08:17:47 -05:00
ctype_ascii.result Bug#27562: ascii.xml invalid? 2007-08-07 05:35:20 -04:00
ctype_big5.result Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl 2008-04-03 11:50:43 +02:00
ctype_collate.result Fix for Bug#32538: View definition picks up character set, 2008-02-12 22:09:16 +03:00
ctype_cp932_binlog_row.result BUG#29020 (Event results not correctly replicated to slave in RBR): 2008-03-28 13:16:41 +01:00
ctype_cp932_binlog_stm.result Merge 2008-10-02 10:56:07 +05:00
ctype_cp1250_ch.result After merge fix 2008-03-08 01:14:56 +04:00
ctype_cp1251.result
ctype_create.result
ctype_eucjpms.result Bug#32510 LIKE search fails with indexed 'eucjpms' and 'ujis' char column 2008-02-04 11:10:40 +04:00
ctype_euckr.result Merge stella.local:/home2/mydev/mysql-5.1-amain 2008-03-26 10:27:00 +01:00
ctype_filename.result
ctype_filesystem.result Addendum to bug #37339 : make the test case portable to windows 2008-12-01 13:34:53 +02:00
ctype_gb2312.result Merge stella.local:/home2/mydev/mysql-5.1-amain 2008-03-26 10:27:00 +01:00
ctype_gbk.result Merge host.loc:/home/uchum/work/5.0-bugteam 2008-04-23 11:06:26 +05:00
ctype_hebrew.result
ctype_latin1.result Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b29499 2007-07-04 16:34:47 +05:00
ctype_latin1_de.result Bug#27877 incorrect german order in utf8_general_ci 2008-02-11 16:28:33 +04:00
ctype_latin2.result
ctype_latin2_ch.result
ctype_ldml.result Bug#28916 LDML doesn't work for utf8 2007-06-07 17:55:55 +05:00
ctype_many.result
ctype_mb.result
ctype_recoding.result Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 2007-09-20 14:10:05 +05:00
ctype_sjis.result Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl 2008-02-20 19:49:26 +01:00
ctype_tis620.result
ctype_uca.result Merge stella.local:/home2/mydev/mysql-5.1-amain 2008-03-26 10:27:00 +01:00
ctype_ucs.result 5.0-bugteam->5.1-bugteam merge 2008-12-23 18:21:01 +04:00
ctype_ucs2_def.result Merge stella.local:/home2/mydev/mysql-5.0-axmrg 2008-01-16 13:53:43 +01:00
ctype_ujis.result Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl 2008-02-20 19:49:26 +01:00
ctype_ujis_ucs2.result Bug#28600 Yen sign and overline ujis conversion change 2007-05-30 12:30:15 +05:00
ctype_utf8.result Auto-merge 2008-11-21 17:32:45 +04:00
date_formats.result auto-merge 2009-01-09 14:22:15 +01:00
ddl_i18n_koi8r.result Fix for Bug#30217: Views: changes in metadata behaviour 2008-02-22 13:30:33 +03:00
ddl_i18n_utf8.result Fix for Bug#30217: Views: changes in metadata behaviour 2008-02-22 13:30:33 +03:00
deadlock_innodb.result Merge moksha.local:/Users/davi/mysql/push/bugs/25164-5.0 2007-08-27 10:19:58 -03:00
default.result merge 5.0 --> 5.1 2008-09-03 13:06:03 +05:00
delayed.result Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 2007-12-13 16:10:57 +04:00
delete.result Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 2007-12-04 11:32:11 +01:00
derived.result Merge magare.gmz:/home/kgeorge/mysql/work/B31221-5.0-gca-opt 2007-10-18 15:57:59 +03:00
dirty_close.result
distinct.result Post-merge fixes to fix test cases. 2008-10-29 18:38:18 +01:00
drop.result Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl 2008-04-03 11:50:43 +02:00
empty_table.result
endspace.result Fixed bug#28404. 2007-08-02 12:45:56 -07:00
error_simulation.result Dynamically set debug flag for session only 2008-04-03 10:27:56 +02:00
errors.result Bug#28677: SELECT on missing column gives extra error 2007-06-18 16:35:01 +03:00
events_1.result Patch for bug#32664: event.test has timeout randomly. File is split into event_1.test and event_2.test. 2008-02-20 14:40:46 +01:00
events_2.result Bug#35981: ALTER EVENT causes the server to change the PRESERVE option. 2008-08-18 13:05:51 +02:00
events_bugs.result merge: 5.1 -> 5.1-rpl 2009-01-23 13:22:05 +01:00
events_embedded.result Bug#35997 Event scheduler seems to let the server crash, if it is embedded. 2008-05-09 09:43:02 +02:00
events_grant.result Patch for the following bugs: 2007-06-28 21:34:54 +04:00
events_logs_tests.result Test events_logs_tests cleanup 2007-09-05 12:14:43 -06:00
events_microsec.result
events_restart.result Mereg events_restart_phase* to events_restart 2008-04-09 09:43:20 +02:00
events_scheduling.result Fix for Bug#39854 events_scheduling fails sporadically on pushbuild 2008-12-16 19:09:09 +01:00
events_stress.result
events_time_zone.result Fix for Bug#39979 main.events_time_zone does not clean up 2008-11-14 17:18:20 +01:00
events_trans.result Many files: 2007-10-27 01:40:48 +05:00
events_trans_notembedded.result
exampledb.result
execution_constants.result
explain.result backported the fix for bug #34773 to 5.0 2008-12-09 20:35:02 +02:00
fix_priv_tables.result
flush.result Merge mysql.com:/home/hf/work/33334/my50-33334 2008-03-23 20:35:00 +04:00
flush2.result Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-04-16 10:37:50 +02:00
flush_block_commit.result
flush_block_commit_notembedded.result
flush_read_lock_kill.result Bug#34891 sp_notembedded.test fails sporadically 2008-03-13 14:54:29 -03:00
flush_table.result
foreign_key.result
fulltext.result Merge. 2008-12-09 13:27:46 +04:00
fulltext2.result fix test for bug29299 2007-07-06 11:35:10 -07:00
fulltext3.result BUG#29464 - load data infile into table with big5 chinese fulltext index 2007-07-13 03:29:25 +05:00
fulltext_cache.result
fulltext_distinct.result
fulltext_left_join.result
fulltext_multi.result
fulltext_order_by.result
fulltext_plugin.result BUG#39746 - Debug flag breaks struct definition 2008-12-17 17:24:34 +04:00
fulltext_update.result
fulltext_var.result
func_compress.result A fix for Bug#22891 "session level max_allowed_packet can be 2008-11-20 08:51:48 +01:00
func_concat.result Fixed bug #36488: regexp returns false matches, concatenating 2008-05-13 20:27:46 +05:00
func_crypt.result Fix for Bug#32538: View definition picks up character set, 2008-02-12 22:09:16 +03:00
func_date_add.result Bug#28450: The Item_date_add_interval in select list may fail the field 2007-05-30 00:33:12 +04:00
func_default.result
func_des_encrypt.result
func_encrypt.result Fix for Bug#32538: View definition picks up character set, 2008-02-12 22:09:16 +03:00
func_encrypt_nossl.result
func_equal.result
func_gconcat.result Merge magare.gmz:/home/kgeorge/mysql/work/B35298-5.0-bugteam 2008-05-01 14:54:59 +03:00
func_group.result merged bug 39656 to 5.1-bugteam 2008-11-24 18:00:09 +02:00
func_group_innodb.result Bug #27531: 5.1 part of the fix 2007-05-29 15:58:18 +03:00
func_if.result auto merge 5.0-bugteam --> 5.1-bugteam (bug 40761) 2008-12-12 18:19:33 +04:00
func_in.result Bug #41363: crash of mysqld on windows with aggregate in case 2008-12-31 15:55:04 +04:00
func_isnull.result
func_like.result Fix for Bug#32538: View definition picks up character set, 2008-02-12 22:09:16 +03:00
func_math.result Fix for bug #31236: Inconsistent division by zero behavior for 2008-02-20 00:33:43 +03:00
func_misc.result Bug#35848: UUID() returns UUIDs with the wrong time 2008-07-10 05:24:46 +02:00
func_op.result
func_regexp.result Merge 2008-09-05 13:36:02 +05:00
func_rollback.result Additional tests inspired by Bug 2008-04-09 15:56:25 +02:00
func_sapdb.result auto-merge 2008-11-27 12:33:04 +01:00
func_set.result Fix for Bug#32538: View definition picks up character set, 2008-02-12 22:09:16 +03:00
func_str.result 5.0-bugteam->5.1-bugteam merge 2008-12-09 15:16:39 +04:00
func_system.result
func_test.result
func_time.result merge: 5.1 -> 5.1-rpl 2009-01-23 13:22:05 +01:00
func_timestamp.result
gcc296.result
gis-rtree.result Merge magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt 2007-10-23 11:44:14 +03:00
gis.result Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl 2008-03-25 18:40:49 +01:00
grant.result merge: 5.1 -> 5.1-rpl 2009-01-23 13:22:05 +01:00
grant2.result Merging 5.1 main into 5.1-rpl. 2008-10-06 10:27:36 +02:00
grant3.result Fixed bug#31194: Privilege ordering does not order properly 2008-02-13 19:34:12 +04:00
grant_cache_no_prot.result Bug#36086: SELECT * from views don't check column grants 2008-09-03 16:45:40 +02:00
grant_cache_ps_prot.result Bug#36086: SELECT * from views don't check column grants 2008-09-03 16:45:40 +02:00
greedy_optimizer.result Bug #27531: 5.1 part of the fix 2007-05-29 15:58:18 +03:00
group_by.result merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-rpl merging. 2008-11-12 19:51:47 +02:00
group_min_max.result merge 5.0-bugteam -> 5.1-bugteam 2008-08-28 12:54:50 +03:00
group_min_max_innodb.result Fixed bug #36632: SELECT DISTINCT from a simple view on an 2008-06-27 23:50:53 +05:00
handler_innodb.result Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains that 2008-08-11 20:02:03 +02:00
handler_myisam.result Bug#31397 Inconsistent drop table behavior of handler tables. 2007-11-20 15:17:53 -02:00
have_big5.require
have_binlog_format_mixed.require
have_binlog_format_row.require
have_binlog_format_statement.require
have_community_features.require Fix up merge. Some macros are now functions. Some functions are 2007-05-02 14:13:33 -04:00
have_compress.require
have_cp866.require Patch for the following bugs: 2007-06-28 21:34:54 +04:00
have_cp932.require
have_cp1250_ch.require
have_cp1251.require Patch for the following bugs: 2007-06-28 21:34:54 +04:00
have_crypt.require
have_debug.require
have_dynamic_loading.require
have_eucjpms.require
have_euckr.require
have_example_plugin.require
have_gb2312.require
have_gbk.require
have_geometry.require
have_koi8r.require Patch for the following bugs: 2007-06-28 21:34:54 +04:00
have_latin2_ch.require
have_local_infile.require Changes to fix tests in pushbuild. 2008-01-31 12:17:40 +01:00
have_log_bin.require Fix typo 2007-06-07 20:25:22 +02:00
have_met_timezone.require
have_moscow_leap_timezone.require
have_mysql_upgrade.result
have_ndb_extra.require
have_ndbapi_examples.require
have_outfile.require
have_partition.require
have_perror.require
have_query_cache.require
have_simple_parser.require BUG#39746 - Debug flag breaks struct definition 2008-12-17 17:24:34 +04:00
have_sjis.require
have_ssl.require
have_symlink.require
have_tis620.require
have_ucs2.require
have_udf_example.require
have_ujis.require
have_utf8.require Patch for the following bugs: 2007-06-28 21:34:54 +04:00
having.result Merge gleb.loc:/home/uchum/work/bk/5.0-opt 2007-07-26 01:23:39 +05:00
heap.result Merge host.loc:/work/bugs/5.0-bugteam-30059 2008-05-13 17:01:02 +05:00
heap_auto_increment.result
heap_btree.result Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines 2007-10-19 13:06:37 -07:00
heap_hash.result Corrected the error codes and messages for 5.1. This is to fix PB failures introduced by the patch for bug #27643. 2007-05-31 16:04:58 +04:00
help.result
index_merge_innodb.result
index_merge_myisam.result Merge: mysql-5.0-bugteam -> mysql-5.1-bugteam 2008-12-23 16:28:13 +03:00
information_schema.result merge: 5.1 -> 5.1-rpl 2009-01-23 13:22:05 +01:00
information_schema_chmod.result
information_schema_db.result automerge 2008-10-02 15:08:15 +05:00
information_schema_inno.result Bug#35108 SELECT FROM REFERENTIAL_CONSTRAINTS crashes 2008-03-14 14:12:39 +04:00
information_schema_part.result Bug#38909 CREATE_OPTIONS in information_schema produces wrong results 2008-11-13 16:11:51 +04:00
init_connect.result
init_file.result
innodb-autoinc-optimize.result BUG#38350: Many tests don't clean up after themselves on exit. 2008-11-13 20:19:00 +01:00
innodb-autoinc.result Disable part of innodb-autoinc.test, because the MySQL server asserts when 2008-12-19 01:28:51 +01:00
innodb-lock.result
innodb-replace.result Bug#31210: INSERT DELAYED crashes server when used on partitioned tables 2008-06-03 13:25:41 +02:00
innodb-semi-consistent.result Bug #39812: Make statement replication default for 5.1 (to match 5.0) 2008-10-03 15:24:19 +03:00
innodb-ucs2.result Bug#32754 - InnoDB tests do not prepare or clean up correctly 2007-11-27 09:25:45 +01:00
innodb.result merge: 5.1 -> 5.1-rpl 2009-01-23 13:22:05 +01:00
innodb_autoinc_lock_mode_zero.result Apply snapshot innodb-5.1-ss1989 2007-11-06 15:42:58 -07:00
innodb_bug30919.result BUG#30919 2007-12-19 09:37:35 +01:00
innodb_bug34053.result Applied InnoDB snapshot innodb-5.1-ss2298 2008-02-19 09:44:09 -07:00
innodb_bug34300.result Cherry-pick some changes from innodb-5.1-ss2545 snapshot. Includes fixes for 2008-08-20 16:18:33 -06:00
innodb_bug35220.result Cherry-pick fix for Bug#35220 from innodb-5.0-ss2475 snapshot. 2008-08-07 18:25:24 -06:00
innodb_bug38231.result Apply InnoDB snapshot innodb-5.1-ss2858, part 16. Fix merge mistake which 2008-12-14 14:26:31 -07:00
innodb_bug39438.result Apply InnoDB snapshot innodb-5.1-ss2858, part 4. Fixes 2008-12-14 13:31:13 -07:00
innodb_gis.result merge 5.0-opt -> 5.1-opt for bug 30825 2007-10-23 14:26:57 +03:00
innodb_mysql.result Bug#37016: TRUNCATE TABLE removes some rows but not all 2009-01-09 08:20:32 -02:00
innodb_mysql_rbk.result Bug #41543: Assertion `m_status == DA_ERROR' failed in Diagnostics_area::sql_errno 2009-01-09 14:04:47 +02:00
innodb_notembedded.result BUG#37975: wait_for_slave_* should increase the timeout 2008-07-10 18:09:39 +02:00
innodb_timeout_rollback.result Bug#32754 - InnoDB tests do not prepare or clean up correctly 2007-11-27 09:25:45 +01:00
innodb_trx_weight.result Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. 2007-07-10 05:37:43 -06:00
insert.result Merge polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788 2007-12-01 15:40:59 +03:00
insert_notembedded.result The test case for bug 28587 doesn't work with the embedded version, 2007-09-06 13:22:34 -03:00
insert_select.result Merge sunlight.local:/local_work/27216-bug-5.0-opt-mysql 2007-09-24 17:23:40 +04:00
insert_update.result Final fix for bug#38349: Did the changes due to the 2 reviews. 2008-09-10 12:50:39 +02:00
is_debug_build.require
is_embedded.require Bug#35997 Event scheduler seems to let the server crash, if it is embedded. 2008-05-09 09:43:02 +02:00
isam.result
join.result Merge fix for join-testcase failure. 2008-10-06 08:37:52 -04:00
join_crash.result
join_nested.result Merge gleb.loc:/home/uchum/work/bk/5.0-opt 2007-07-13 19:36:10 +05:00
join_outer.result Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt 2007-05-28 00:22:44 +05:00
join_outer_innodb.result BUG#35850 "Performance regression in 5.1.23/5.1.24" 2008-05-07 09:58:21 +04:00
key.result Merge ramayana.hindu.god:/home/tsmith/m/bk/51 2007-12-05 12:33:36 -07:00
key_cache.result Bug#35272: @@global.key_buffer_size = 4294967295 let the server crash 2008-03-27 17:43:17 +01:00
key_diff.result Bug #27531: 5.1 part of the fix 2007-05-29 15:58:18 +03:00
key_primary.result
keywords.result
kill.result Bug#34891 sp_notembedded.test fails sporadically 2008-03-13 14:54:29 -03:00
limit.result Bug#37075: offset of limit clause might be truncated on 32-bits server w/o big tables 2008-10-15 18:34:51 -03:00
loaddata.result Merging 5.1 main into 5.1-rpl 2008-10-23 21:27:09 +02:00
loaddata_autocom_innodb.result WL#4189 2007-12-12 18:19:24 +01:00
lock.result Add a test case for Bug#5719 "impossible to lock VIEW". 2007-08-02 13:59:02 +04:00
lock_multi.result manual merge 5.0-5.1.29-rc --> 5.1-5.1.29-rc 2008-10-09 20:57:41 +05:00
lock_tables_lost_commit.result
log_state.result Fix for Bug#40377 sporadic pushbuild failure in log_state: result mismatch 2009-01-13 14:09:24 +01:00
log_tables-big.result
log_tables.result BUG#38350: Many tests don't clean up after themselves on exit. 2008-11-13 20:19:00 +01:00
long_tmpdir.result Fix for bug #29015 "Stack overflow in processing temporary table name when tmpdir path is long" 2007-06-11 23:06:20 +04:00
lowercase0.require Bug#37402: Mysql cant read partitioned table with capital letter in the name 2008-07-11 01:14:13 +02:00
lowercase1.require Bug #27653: Temp table can't be created if lower_case_table_names=1 and 2007-04-30 23:16:46 +02:00
lowercase2.require
lowercase_fs_off.result
lowercase_mixed_tmpdir.result Bug #27653: Temp table can't be created if lower_case_table_names=1 and 2007-04-30 23:16:46 +02:00
lowercase_table.result
lowercase_table2.result
lowercase_table3.result BUG#39853: lowercase_table3 fails on powermacg5 in rpl tree 2008-11-14 16:36:33 +01:00
lowercase_table_grant.result
lowercase_table_qcache.result
lowercase_view.result merge bug 31562 to 5.1 : changed SHOW CREATE VIEW format 2007-11-13 19:32:12 +02:00
merge-big.result Bug#34376 - merge-big test fails 2008-02-07 12:04:19 +01:00
merge.result Bug#35068 Assertion fails when reading from i_s.tables and there is incorrect merge table 2008-10-09 13:55:16 +05:00
merge_innodb.result Bug#30491 - MERGE doesn't report error when one table is Innodb 2007-11-30 15:16:31 +01:00
metadata.result automerge 5.0-bugteam --> 5.1-bugteam 2008-10-10 16:44:10 +05:00
mix2_myisam.result revert the following CS on grounds of "right patch, wrong time": 2008-05-14 10:45:32 +02:00
mix2_myisam_ucs2.result
multi_statement.result
multi_update.result Merge 5.0 -> 51. of fix for bug 26890 2008-11-25 13:17:50 +01:00
multi_update2.result Fix for Bug#26890 main.multi_update times out 2008-11-19 19:17:26 +01:00
multi_update_tiny_hash.result Fixed bug#36676: multiupdate using LEFT JOIN updates only 2008-05-18 14:21:25 +05:00
myisam-blob.result
myisam-system.result
myisam.result Merge 5.1 main -> 5.1-rpl 2008-09-06 08:51:17 +08:00
myisampack.result Bug#24289 Status Variable "Questions" gets wrong values with Stored Routines(for 5.1) 2008-12-17 17:23:21 +04:00
mysql.result merged 41437 to 5.1-bugteam 2009-01-09 19:51:52 +02:00
mysql_client_test.result BUG#38350: Many tests don't clean up after themselves on exit. 2008-11-13 20:19:00 +01:00
mysql_comments.result 5.1-specific changes for bug #26215 after merging the patch from 5.0: 2007-11-02 16:40:08 +03:00
mysql_cp932.result
mysql_protocols.result
mysql_upgrade.result WL#4189 mtr.pl v2 2009-01-26 15:20:33 +01:00
mysqladmin.result
mysqlbinlog-cp932.result
mysqlbinlog.result Merge 5.1->5.1-rpl 2008-05-30 11:12:07 +02:00
mysqlbinlog2.result BUG#34541: mysqlbinlog prints 'set;' in stm mode after changing autocommit mode 2008-04-02 16:49:22 +07:00
mysqlbinlog_base64.result Rmove RESET MASTER from have_log_bin.inc because it can cause some 2008-07-28 15:15:20 +08:00
mysqlbinlog_row.result Postfix of tests after merge 2008-09-06 12:49:43 +08:00
mysqlbinlog_row_big.result merge 5.1 --> 5.1-rpl 2008-12-13 19:42:12 +00:00
mysqlbinlog_row_innodb.result Postfix of tests after merge 2008-09-06 12:49:43 +08:00
mysqlbinlog_row_myisam.result Postfix of tests after merge 2008-09-06 12:49:43 +08:00
mysqlbinlog_row_trans.result Postfix of tests after merge 2008-09-06 12:49:43 +08:00
mysqlcheck.result Merge 2009-01-27 15:10:15 +01:00
mysqldump-compat.result Fixed bug #30126. 2007-08-31 16:59:07 +05:00
mysqldump-max.result Bug#31434 mysqldump dumps view as table 2008-09-11 08:14:19 +02:00
mysqldump-no-binlog.result Bug #34909: mysqldump returns a 0 status on error when using 2008-03-07 11:15:49 +02:00
mysqldump.result merged 5.1-5.1.29-rc -> 5.1-bugteam 2008-10-01 12:47:25 +03:00
mysqlshow.result Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-enterprise-formergecomm 2007-04-27 16:45:01 -04:00
mysqlslap.result Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 2007-12-20 12:32:16 -08:00
mysqltest.result Bug#35701 please allow test language variables in connection and 2009-01-15 09:05:51 +01:00
named_pipe.result Additional patch for Bug#32538. Fix result files of windows test cases. 2008-02-13 12:02:16 +03:00
ndb_default_cluster.require
negation_elimination.result Fix for Bug#32538: View definition picks up character set, 2008-02-12 22:09:16 +03:00
no-threads.result Bug #30651 Problems with thread_handling system variable 2007-12-11 17:30:42 -05:00
not_embedded.require
not_embedded_server.result BUG#39851: race between check_testcase and tests running 'show processlist' 2008-10-18 20:36:34 +02:00
not_ndb.require
not_ndb_default.require
not_openssl.require
not_partition.require
not_partition.result
not_valgrind.require
not_windows.require
null.result Fix for Bug#32538: View definition picks up character set, 2008-02-12 22:09:16 +03:00
null_key.result BUG#34945: "ref_or_null queries that are null_rejecting and have a null value crash mysql" 2008-03-03 20:35:44 +03:00
odbc.result
olap.result Merge mysql.com:/home/ram/work/b32558/b32558.5.0 2007-11-23 12:35:02 +04:00
one_thread_per_connection.require
openssl_1.result Bug#39178: non-RSA keys in connection to a RSA-keyed yaSSL-using server \ 2008-11-18 11:45:44 -05:00
order_by.result merge 5.0-bugteam --> 5.1-bugteam (bug 39844) 2008-10-16 23:04:31 +05:00
order_fill_sortbuf.result
outfile.result WL#4189 2007-12-12 18:19:24 +01:00
outfile_loaddata.result Fixed bug #32533. 2007-11-20 20:15:20 +04:00
overflow.result
packet.result A fix for Bug#22891 "session level max_allowed_packet can be 2008-11-20 08:51:48 +01:00
parser.result Cleanup merge issues in mysql-test/t/parser.test 2008-07-08 10:33:09 -06:00
parser_bug21114_innodb.result
parser_precedence.result Bug#30625 (Performance, reduce depth for expressions) 2007-08-28 11:16:03 -06:00
parser_stack.result Bug#35577 (CREATE PROCEDURE causes either crash or syntax error depending on 2008-07-14 15:41:30 -06:00
partition.result merge 5.1 --> 5.1-rpl 2008-12-13 19:42:12 +00:00
partition_archive.result Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output 2008-11-04 08:43:21 +01:00
partition_blackhole.result This changeset contains the following stuff: 2007-10-22 20:10:51 +02:00
partition_bug18198.result Disabled ascii-function 2007-06-13 17:28:59 +02:00
partition_charset.result Disabled ascii-function 2007-06-13 17:28:59 +02:00
partition_csv.result This changeset contains the following stuff: 2007-10-22 20:10:51 +02:00
partition_datatype.result 5.0-bugteam->5.1-bugteam merge 2008-12-09 15:16:39 +04:00
partition_error.result Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl 2008-04-03 11:50:43 +02:00
partition_federated.result
partition_grant.result
partition_hash.result Bug#35745: SELECT COUNT(*) is not correct for some partitioned tables. 2008-07-07 22:42:19 +02:00
partition_innodb.result Bug#40595: Non-matching rows not released with READ-COMMITTED 2008-11-10 21:13:24 +01:00
partition_innodb_semi_consistent.result post push fix for bug#40595 2008-12-16 12:44:18 +01:00
partition_innodb_stmt.result Bug#39084: Getting intermittent errors with statement-based binary logging 2008-10-29 21:20:04 +01:00
partition_list.result BUG#18198 2007-04-20 18:35:16 +02:00
partition_mgm.result merge 2008-12-10 09:06:58 +01:00
partition_mgm_err.result merge 2008-11-04 09:36:56 +01:00
partition_mgm_err2.result
partition_not_windows.result merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-rpl merging. 2008-11-12 19:51:47 +02:00
partition_order.result
partition_pruning.result Bug#40972: some sql execution lead the whole databse crashing 2008-12-28 12:33:49 +01:00
partition_range.result Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output 2008-11-04 08:43:21 +01:00
partition_symlink.result Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output 2008-11-04 08:43:21 +01:00
partition_windows.result Post-merge fix: Update warning number due to repositioning in the error list. 2008-10-26 15:05:24 -02:00
perror-win.result error code is changed to satisfy Win NT 2008-11-28 17:12:43 +04:00
perror.result
plugin.result Bug#32757: hang with sql_mode set when setting some global variables 2008-02-24 14:12:17 +01:00
plugin_load.result Bug#33358 2008-01-25 16:05:15 -08:00
preload.result BUG#26976 - Missing table in merge not noted in related error msg + 2007-06-06 04:42:41 +05:00
profiling.result Final fix for bug#38349: Did the changes due to the 2 reviews. 2008-09-10 12:50:39 +02:00
ps.result Manual merge of bug#26030 in mysql-5.1-bugteam 2008-07-07 15:53:20 -06:00
ps_1general.result Merge 5.1 main -> 5.1-rpl 2008-09-06 08:51:17 +08:00
ps_2myisam.result Merge from 5.0-bugteam. 2008-08-15 16:42:29 -04:00
ps_3innodb.result Merge from 5.0-bugteam. 2008-08-15 16:42:29 -04:00
ps_4heap.result Merge from 5.0-bugteam. 2008-08-15 16:42:29 -04:00
ps_5merge.result Merge from 5.0-bugteam. 2008-08-15 16:42:29 -04:00
ps_10nestset.result
ps_11bugs.result Bug #32124: crash if prepared statements refer to variables in the where clause 2008-10-08 14:23:53 +03:00
ps_ddl.result Improve the testcases for Bug 12093 in ps_ddl.test 2008-08-13 21:42:21 +02:00
ps_ddl1.result A fix for 2008-07-03 23:41:22 +04:00
ps_grant.result
ps_not_windows.result
query_cache.result merge: 5.1 -> 5.1-rpl 2009-01-23 13:22:05 +01:00
query_cache_28249.result - Fix for Bug#40179 Test main.query_cache failing randomly on Pushbuild, test weakness 2008-11-28 16:45:34 +01:00
query_cache_debug.result mysqld.cc: 2008-04-02 00:43:17 +02:00
query_cache_merge.result Cherry-pick Bug#33362 from mysql-5.1 2008-07-24 11:14:34 -03:00
query_cache_notembedded.result BUG#37975: wait_for_slave_* should increase the timeout 2008-07-10 18:09:39 +02:00
query_cache_ps_no_prot.result Fix for BUG#25843: changing default database between PREPARE and EXECUTE 2007-08-31 20:42:14 +04:00
query_cache_ps_ps_prot.result Fix for BUG#25843: changing default database between PREPARE and EXECUTE 2007-08-31 20:42:14 +04:00
query_cache_with_views.result Bug#30269 Query cache eats memory 2007-08-21 13:43:09 +02:00
raid.result
range.result Merge mysql.com:/misc/mysql/34731/50-34731 2008-03-27 03:18:46 +01:00
read_many_rows_innodb.result Merge moonbone.local:/mnt/gentoo64/work/24989-bug-5.0-opt-mysql 2007-08-02 18:42:56 +04:00
read_only.result Merge adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime 2007-12-10 16:47:45 +01:00
read_only_innodb.result Fix for bug #35732: read-only blocks SELECT statements in InnoDB 2008-04-08 10:20:58 +05:00
rename.result
renamedb.result WL#4030 (Deprecate RENAME DATABASE: replace with ALTER DATABASE <name> 2007-09-10 16:10:37 -06:00
repair.result fix typo 2008-06-17 19:05:56 -06:00
replace.result
rollback.result
round.result
row.result Merge host.loc:/home/uchum/work/PP/5.0-opt-34620 2008-02-28 23:01:22 +04:00
rowid_order_innodb.result
rpl_colSize.result WL#3228 (NDB) : RBR using different table defs on slave/master 2007-07-27 14:38:36 -04:00
rpl_extraColmaster_innodb.result WL#3915 : (NDB) master's cols > slave 2007-07-27 23:11:36 -04:00
rpl_extraColmaster_myisam.result WL#3915 : (NDB) master's cols > slave 2007-07-27 23:11:36 -04:00
schema.result Add mtr database 2008-04-02 10:06:36 +02:00
select.result 5.0-bugteam->5.1-bugteam merge 2008-12-24 19:26:48 +04:00
select_found.result Fixed bug#28404. 2007-08-02 12:45:56 -07:00
select_safe.result
server_id.require
server_id1.require
shm.result Additional patch for Bug#32538. Fix result files of windows test cases. 2008-02-13 12:02:16 +03:00
show_check.result merge 5.1 --> 5.1-rpl 2008-12-13 19:42:12 +00:00
skip_grants.result Merge kaamos.(none):/data/src/opt/bug33305/my50-bug33305 2008-01-10 13:37:54 +03:00
skip_log_bin.result Bug #38798 Assertion mysql_bin_log.is_open() failed in binlog_trans_log_savepos() 2008-08-29 17:20:08 +03:00
skip_name_resolve.result
slave-running.result
slave-stopped.result
sp-big.result
sp-code.result Manual merge 2008-03-25 17:48:05 -06:00
sp-destruct.result Check warnings in servers error log as part of test case 2008-04-08 16:51:26 +02:00
sp-dynamic.result Merge adventure.(none):/home/thek/Development/cpp/bug28846/my50-bug28846 2007-06-22 15:23:51 +02:00
sp-error.result Merging 5.1 main into 5.1-rpl 2008-10-23 21:27:09 +02:00
sp-prelocking.result Bug #29929 LOCK TABLES does not pre-lock tables used in triggers of the locked tables 2007-07-27 16:56:29 +02:00
sp-security.result Check warnings in servers error log as part of test case 2008-04-08 16:51:26 +02:00
sp-threads.result
sp-ucs2.result
sp-vars.result Merge adventure.(none):/home/thek/Development/cpp/bug26277/my51-bug26277 2007-05-18 14:29:24 +02:00
sp.result merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-rpl merging. 2008-11-12 19:51:47 +02:00
sp_gis.result Many files: 2007-10-27 01:40:48 +05:00
sp_notembedded.result Post-merge fix. 2008-03-26 20:27:23 +01:00
sp_stress_case.result
sp_trans.result Bug #29245: Bad Merge Caused Error Codes Conflict between 5.0/5.1 2007-06-26 13:15:43 +02:00
sp_trans_log.result BUG#26395: if crash during autocommit update to transactional table on master, slave fails 2007-12-21 20:30:23 +01:00
sql_mode.result Bug#32753: PAD_CHAR_TO_FULL_LENGTH is not documented and interferes with grant tables 2008-02-24 13:58:07 +01:00
ssl-big.result Bug #29579 Clients using SSL can hang the server 2007-07-12 22:06:33 -04:00
ssl.result Fix for Bug#32538: View definition picks up character set, 2008-02-12 22:09:16 +03:00
ssl_8k_key.result Bug #29784 YaSSL assertion failure when reading 8k key. 2007-07-17 14:43:56 -04:00
ssl_compress.result Fix for Bug#32538: View definition picks up character set, 2008-02-12 22:09:16 +03:00
ssl_connect.result
status.result merge: 5.1 -> 5.1-rpl 2009-01-23 13:22:05 +01:00
status2.result Bug#24289 Status Variable "Questions" gets wrong values with Stored Routines(for 5.1) 2008-12-17 17:23:21 +04:00
strict.result manual merge 2008-12-01 05:17:52 +01:00
strict_autoinc_1myisam.result
strict_autoinc_2innodb.result
strict_autoinc_3heap.result
subselect.result merge 5.1 --> 5.1-rpl 2008-12-13 19:42:12 +00:00
subselect2.result
subselect3.result manual merge 5.0-bugteam --> 5.1-bugteam 2008-10-10 16:48:47 +05:00
subselect_debug.result Bug#37627: addendum : 2008-07-07 11:43:56 +03:00
subselect_gis.result
subselect_innodb.result
subselect_notembedded.result Fix for bug #34650: Test suite without cluster fails on Mac OS X 2008-03-07 21:14:34 +03:00
sum_distinct-big.result
sum_distinct.result
symlink.result merge 5.1 --> 5.1-rpl 2008-12-13 19:42:12 +00:00
synchronization.result
sysdate_is_now.result
system_mysql_db.result Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl 2008-02-28 12:21:44 +01:00
system_mysql_db_refs.result
tablelock.result Bug#23588 SHOW COLUMNS on a temporary table causes locking issues 2008-02-22 12:30:17 +04:00
temp_table.result Bug#41348: INSERT INTO tbl SELECT * FROM temp_tbl overwrites 2009-01-07 10:11:37 -02:00
testdb_only.require
timezone.result
timezone2.result merge 5.1 --> 5.1-rpl 2008-12-13 19:42:12 +00:00
timezone3.result Bug #39920: MySQL cannot deal with Leap Second expression in string literal. 2008-12-01 16:18:35 +02:00
timezone4.result
timezone_grant.result
trigger-compat.result Patch for the following bugs: 2007-06-28 21:34:54 +04:00
trigger-trans.result fixed test suite failures in 5.1-bugteam 2008-10-07 19:54:12 +03:00
trigger.result Merge 5.1->5.1-rpl 2008-05-30 11:12:07 +02:00
trigger_notembedded.result Fix result files (Bug#21854). 2008-03-22 11:01:31 +03:00
true.require
truncate.result reverted the fix for Bug#5507 2007-04-17 12:32:01 +02:00
type_binary.result Merge host.loc:/work/bugs/5.0-bugteam-30059 2008-05-13 17:01:02 +05:00
type_bit.result 5.0-bugteam->5.1-bugteam merge 2008-12-09 17:31:22 +04:00
type_bit_innodb.result Merge mysql.com:/misc/mysql/31177/50-31177 2007-12-01 15:53:56 +01:00
type_blob.result Merge 5.1->5.1-rpl 2008-05-30 11:12:07 +02:00
type_date.result Merge of fix for bug 2009-01-13 15:04:28 +01:00
type_datetime.result Merge 2008-09-09 20:52:38 +05:00
type_decimal.result Merge amd64.(none):/src/rel_clean_up/my50-rel_clean_up 2008-04-28 14:12:52 -04:00
type_enum.result Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 2007-09-20 14:10:05 +05:00
type_float.result Merge mysql-5.0-bugteam->mysql-5.1-bugteam. 2008-12-10 19:17:58 +03:00
type_nchar.result
type_newdecimal-big.result
type_newdecimal.result merging 2008-11-18 13:52:03 +04:00
type_ranges.result Bug#30081: "ON UPDATE CURRENT_TIMESTAMP" wasn't shown by the SHOW FIELDS 2007-11-13 13:24:48 +00:00
type_set.result Bug #38701: Crash in String::append when inserting duplicate empty strings an uft8 2008-09-05 18:21:59 +03:00
type_time.result Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-opt 2007-07-18 15:56:29 +03:00
type_timestamp.result Bug#30081: "ON UPDATE CURRENT_TIMESTAMP" wasn't shown by the SHOW FIELDS 2007-11-13 13:24:48 +00:00
type_uint.result
type_varchar.result
type_year.result
udf.result merging 2008-08-26 15:22:09 +05:00
udf_skip_grants.result Fix for bug #33305: Test case in 'skip_grants' file need dynamic loading 2007-12-24 17:42:13 +03:00
union.result A fix for Bug#22891 "session level max_allowed_packet can be 2008-11-20 08:51:48 +01:00
unsafe_binlog_innodb.result Bug #28757 Test program / embedded server crash in test "unsafe_binlog_innodb" 2007-06-12 17:53:16 +05:00
update.result Bug #40745: Error during WHERE clause calculation in UPDATE 2008-11-28 20:36:07 +04:00
upgrade.result WL#4030 (Deprecate RENAME DATABASE: replace with ALTER DATABASE <name> 2007-09-10 16:10:37 -06:00
user_limits.result
user_var-binlog.result BUG#34541: mysqlbinlog prints 'set;' in stm mode after changing autocommit mode 2008-04-02 16:49:22 +07:00
user_var.result Bug#26020: User-Defined Variables are not consistent with 2008-09-18 13:38:44 +05:00
varbinary.result backport from 6.0 2008-06-27 20:56:41 +05:00
variables+c.result Fix up merge. Some macros are now functions. Some functions are 2007-05-02 14:13:33 -04:00
variables-big.result BUG#26395: if crash during autocommit update to transactional table on master, slave fails 2007-12-21 20:30:23 +01:00
variables-notembedded.result merge 5.1 --> 5.1-rpl 2008-12-13 19:42:12 +00:00
variables.result merge 5.1 --> 5.1-rpl 2008-12-13 19:42:12 +00:00
variables_debug.result Bug#34424 query_cache_debug.test leads to valgrind warnings 2008-02-26 12:03:59 -03:00
view.result merge 5.1 --> 5.1-rpl 2008-12-13 19:42:12 +00:00
view_grant.result Bug#35600: Security breach via view, I_S table and prepared 2008-09-09 12:49:08 +02:00
wait_timeout.result
warnings.result Merging 5.1 main into 5.1-rpl 2008-10-23 21:27:09 +02:00
warnings_engine_disabled.result Bug#29263 disabled storage engines omitted in SHOW ENGINES 2008-12-17 19:45:34 +04:00
windows.require
windows.result Post-merge fix: Update warning number due to repositioning in the error list. 2008-10-26 15:05:24 -02:00
xa.result Post-merge fix: drop table at the end of test. 2008-10-21 19:02:26 -02:00
xml.result Bug#38227 EXTRACTVALUE doesn't work with DTD declarations 2008-12-10 13:05:57 +04:00