Jon Olav Hauglid 142a162c66 manual merge from mysql-trunk-bugfixing ... Conflicts: Text conflict in mysql-test/r/archive.result Contents conflict in mysql-test/r/innodb_bug38231.result Text conflict in mysql-test/r/mdl_sync.result Text conflict in mysql-test/suite/binlog/t/disabled.def Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result Text conflict in mysql-test/t/archive.test Contents conflict in mysql-test/t/innodb_bug38231.test Text conflict in mysql-test/t/mdl_sync.test Text conflict in sql/sp_head.cc Text conflict in sql/sql_show.cc Text conflict in sql/table.cc Text conflict in sql/table.h		2010-06-06 13:19:29 +02:00
..
1st.result	WL#2360 Performance schema	2010-01-11 18:47:27 -07:00
alias.result	Backport of Bug#27249 to mysql-next-mr	2009-11-10 18:43:43 -02:00
almost_full.result
alter_table-big.result
alter_table.result	test added for the bug #45052	2010-05-31 18:33:38 +05:00
analyse.result	Bug #48293: crash with procedure analyse, view with > 10 columns,	2009-10-30 11:40:44 +02:00
analyze.result	Patch for WL#3736: Extended Table, Column and Index Comments.	2010-02-20 13:07:32 +03:00
ansi.result
archive-big.result
archive.result	manual merge from mysql-trunk-bugfixing	2010-06-06 13:19:29 +02:00
archive_bitfield.result
archive_gis.result	Backport of WL #2934: Make/find library for doing float/double	2009-12-22 19:23:13 +03:00
archive_plugin.result	only This is a backport of the patch for 47739 into trunk.	2010-04-26 21:39:24 +02:00
auto_increment.result
backup.result	Bug#47974 'TYPE=storage_engine' is deprecated and will be	2010-02-09 11:30:50 +01:00
bench_count_distinct.result
big_test.require
bigint.result	Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.	2010-02-26 16:06:31 +03:00
binary.result
binlog_tx_isolation.result
blackhole_plugin.result	backport of patch for blckhole plugin (47748) to trunk-bugfixing.	2010-04-26 20:44:10 +02:00
bool.result
bootstrap.result
bug39022.result	Committing on behalf or Dmitry Lenev:	2010-04-28 14:04:11 +04:00
bug46080.result	Manual merge from mysql-trunk-merge.	2010-02-03 19:21:17 +03:00
bug46261.result	Bug#46261 Plugins can be installed with --skip-grant-tables	2010-04-22 15:52:00 +02:00
bug46760.result
bug47671.result	Fix for BUG#47671 - wrong character-set after upgrade from 5.1.34 to 5.1.39	2009-11-25 12:25:49 +05:30
bulk_replace.result
cache_innodb.result	WL#4738 streamline/simplify @@variable creation process	2009-12-22 10:35:56 +01:00
case.result	WL#2649 Number-to-string conversions	2010-02-11 08:17:25 +04:00
case_insensitive_file_system.require
case_insensitive_fs.require	Bug#41049 does syntax "grant" case insensitive?	2009-10-27 12:09:19 +04:00
case_sensitive_file_system.require
cast.result	Backport of WL #2934: Make/find library for doing float/double	2009-12-22 19:23:13 +03:00
change_user.result	WL#4738 streamline/simplify @@variable creation process	2009-12-22 10:35:56 +01:00
check.result
check_var_limit.require
client_xml.result
comment_column.result	Patch for WL#3736: Extended Table, Column and Index Comments.	2010-02-20 13:07:32 +03:00
comment_column2.result	Patch for WL#3736: Extended Table, Column and Index Comments.	2010-02-20 13:07:32 +03:00
comment_index.result	Patch for WL#3736: Extended Table, Column and Index Comments.	2010-02-20 13:07:32 +03:00
comment_table.result	Patch for WL#3736: Extended Table, Column and Index Comments.	2010-02-20 13:07:32 +03:00
comments.result
commit_1innodb.result	BUG#50670: Slave stops with error code 1644	2010-04-28 14:47:49 +02:00
compare.result	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-03-12 12:51:53 +03:00
compress.result	Patch for WL#3736: Extended Table, Column and Index Comments.	2010-02-20 13:07:32 +03:00
concurrent_innodb_safelog.result
concurrent_innodb_unsafelog.result
connect.result
consistent_snapshot.result
constraints.result	Bug#11714 Non-sensical ALTER TABLE ADD CONSTRAINT allowed	2010-01-22 19:00:19 -07:00
contributors.result
count_distinct.result	Bug#51980 mysqld service crashes with a simple COUNT(DISTINCT) query over a view	2010-04-13 11:38:28 +02:00
count_distinct2.result
count_distinct3.result
crash_commit_before.result
create-big.result
create.result	Bug#49193 CREATE TABLE reacts differently depending on whether	2010-05-05 23:28:58 +02:00
create_not_windows.result
create_select_tmp.result
csv.result	Manual merge from mysql-trunk-merge.	2010-02-24 16:52:27 +03:00
csv_alter_table.result
csv_not_null.result
ctype_ascii.result
ctype_big5.result	WL#4583 Case conversion in Asian character sets	2010-01-14 15:17:57 +04:00
ctype_binary.result	Patch for Bug#21818 (Return value of ROW_COUNT() is incorrect	2010-05-14 09:28:51 +04:00
ctype_collate.result	Review fixes for BUG#48161 and BUG#48447	2009-11-06 11:49:27 +01:00
ctype_cp932_binlog_row.result
ctype_cp932_binlog_stm.result	BUG#50670: Slave stops with error code 1644	2010-04-28 14:47:49 +02:00
ctype_cp1250_ch.result
ctype_cp1251.result	Patch for Bug#21818 (Return value of ROW_COUNT() is incorrect	2010-05-14 09:28:51 +04:00
ctype_create.result
ctype_errors.result	WL#751 Error message construction, backport	2009-10-15 17:23:43 +05:00
ctype_eucjpms.result	WL#3090 Japanese Character Set adjustments	2010-02-15 09:57:24 +04:00
ctype_euckr.result	WL#4583 Case conversion in Asian character sets	2010-01-14 15:17:57 +04:00
ctype_filename.result
ctype_filesystem.result
ctype_gb2312.result	WL#4583 Case conversion in Asian character sets	2010-01-14 15:17:57 +04:00
ctype_gbk.result	WL#4583 Case conversion in Asian character sets	2010-01-14 15:17:57 +04:00
ctype_gbk_binlog.result
ctype_hebrew.result
ctype_latin1.result	Patch for Bug#21818 (Return value of ROW_COUNT() is incorrect	2010-05-14 09:28:51 +04:00
ctype_latin1_de.result
ctype_latin2.result
ctype_latin2_ch.result
ctype_ldml.result	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
ctype_many.result	Backporting WL#1213	2010-02-24 13:15:34 +04:00
ctype_mb.result	Patch for WL#3736: Extended Table, Column and Index Comments.	2010-02-20 13:07:32 +03:00
ctype_recoding.result	WL#751 Error message construction, backport	2009-10-15 17:23:43 +05:00
ctype_sjis.result	WL#3090 Japanese Character Set adjustments	2010-02-15 09:57:24 +04:00
ctype_tis620.result
ctype_uca.result
ctype_ucs.result	Manual merge from mysql-trunk.	2010-05-20 16:35:28 +04:00
ctype_ucs2_def.result	WL#751 Error message construction, backport	2009-10-15 17:23:43 +05:00
ctype_ujis.result	WL#3090 Japanese Character Set adjustments	2010-02-15 09:57:24 +04:00
ctype_ujis_ucs2.result
ctype_utf8.result	Bug#52520 Difference in tinytext utf column metadata	2010-06-02 16:23:50 +04:00
ctype_utf8mb4.result	Bug#52520 Difference in tinytext utf column metadata	2010-06-02 16:23:50 +04:00
ctype_utf8mb4_heap.result	Fixing non-determenistic results.	2010-03-05 12:17:19 +04:00
ctype_utf8mb4_innodb.result	Fixing non-determenistic results.	2010-03-05 12:17:19 +04:00
ctype_utf8mb4_myisam.result	Fixing non-determenistic results.	2010-03-05 12:17:19 +04:00
ctype_utf8mb4_ndb.result	Fixing non-determenistic results.	2010-03-05 12:17:19 +04:00
ctype_utf16.result	Bug#52520 Difference in tinytext utf column metadata	2010-06-02 16:23:50 +04:00
ctype_utf16_uca.result	Backporting WL#1213	2010-02-24 13:15:34 +04:00
ctype_utf32.result	Bug#52520 Difference in tinytext utf column metadata	2010-06-02 16:23:50 +04:00
ctype_utf32_uca.result	Backporting WL#1213	2010-02-24 13:15:34 +04:00
date_formats.result	WL#4738 streamline/simplify @@variable creation process	2009-12-22 10:35:56 +01:00
ddl_i18n_koi8r.result	backported:	2010-01-15 15:42:15 +04:00
ddl_i18n_utf8.result	backported:	2010-01-15 15:42:15 +04:00
deadlock_innodb.result
debug_sync.result	Implement new type-of-operation-aware metadata locks.	2010-02-01 14:43:06 +03:00
default.result	Bug#33717 INSERT...(default) fails for enum. Crashes CSV tables, loads spaces for MyISAM	2010-02-17 16:13:42 +04:00
delayed.result	Manual merge from mysql-trunk.	2009-12-11 12:39:38 +03:00
delete.result	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-05-24 00:41:18 +04:00
deprecated_features.result	BUG#48048: Deprecated constructs need removal in Betony	2009-11-04 12:28:20 +00:00
derived.result	Backport of Bug#27525 to mysql-next-mr	2009-11-10 16:48:46 -02:00
dirty_close.result	Backport of Bug#10374 to mysql-next-mr	2009-11-10 17:09:27 -02:00
disabled_partition.require
distinct.result
drop-no_root.result	Backporting of Bug#40128 from 6.0 to next-mr.	2009-10-09 18:52:49 +04:00
drop.result	Merge next-mr -> next-4284-merge.	2010-02-04 20:34:15 +03:00
drop_debug.result	Backport of:	2009-12-08 10:53:40 +03:00
empty_table.result
endspace.result
error_simulation.result	Fix for bug#50946: fast index creation still seems to copy the table	2010-04-25 15:06:40 +04:00
errors.result	Bug#52430 Incorrect key in the error message for duplicate key error involving BINARY type	2010-05-27 20:01:43 +04:00
events_1.result	A backport of a patch for Bug#35297.	2009-10-08 00:57:03 +04:00
events_2.result	WL#4738 streamline/simplify @@variable creation process	2009-12-22 10:35:56 +01:00
events_bugs.result	WL#4738 streamline/simplify @@variable creation process	2009-12-22 10:35:56 +01:00
events_embedded.result
events_grant.result	Bug#35427 INFORMATION_SCHEMA.TABLES.TABLE_CATALOG is NULL, should be "def"	2009-10-23 16:02:20 +05:00
events_logs_tests.result
events_microsec.result
events_restart.result
events_scheduling.result	Backport from next-mr-bugfixing of tor.didriksen@sun.com-20100106140051-3j2iuag63eltsr2e	2010-05-19 11:18:59 +02:00
events_stress.result
events_time_zone.result
events_trans.result
events_trans_notembedded.result
execution_constants.result
explain.result	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-05-07 20:17:55 +04:00
fix_priv_tables.result
flush.result	A fix and a test case for Bug#51710 FLUSH TABLES <view> WITH READ	2010-03-10 17:35:25 +03:00
flush2.result	BUG#48048: Deprecated constructs need removal in Betony	2009-11-04 12:28:20 +00:00
flush_block_commit.result	Backport of:	2009-12-09 18:56:34 +03:00
flush_block_commit_notembedded.result	Backport of revno ## 2617.31.1, 2617.31.3, 2617.31.4, 2617.31.5,	2009-12-05 02:02:48 +03:00
flush_read_lock_kill.result
flush_table.result	Initial import of WL#3726 "DDL locking for all metadata objects".	2009-11-30 18:55:03 +03:00
foreign_key.result	Bug#34455 Ambiguous foreign keys syntax is accepted	2010-01-25 04:55:31 -07:00
fulltext.result	Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.	2010-04-02 19:17:43 +04:00
fulltext2.result
fulltext3.result
fulltext_cache.result
fulltext_distinct.result
fulltext_left_join.result
fulltext_multi.result
fulltext_order_by.result	Bug #49734: Crash on EXPLAIN EXTENDED UNION ... ORDER BY <any non-const-function>	2009-12-22 17:52:15 +02:00
fulltext_plugin.result
fulltext_update.result
fulltext_var.result
func_compress.result
func_concat.result	Bug #40625: Concat fails on DOUBLE values in a Stored	2010-04-03 00:30:22 +04:00
func_crypt.result
func_date_add.result
func_default.result	Bug#30302: Tables that were optimized away are printed in the	2009-10-19 15:13:26 +04:00
func_des_encrypt.result
func_digest.result	Backport of:	2010-04-13 19:04:45 +04:00
func_encrypt.result
func_encrypt_nossl.result	Backport of:	2010-04-13 19:04:45 +04:00
func_equal.result
func_gconcat.result	Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.	2010-04-03 21:35:51 +04:00
func_group.result	Backport of WL #2934: Make/find library for doing float/double	2009-12-22 19:23:13 +03:00
func_group_innodb.result
func_if.result
func_in.result	Bug #44139: Table scan when NULL appears in IN clause	2009-10-05 10:27:36 +05:00
func_isnull.result	Bug#41371 Select returns 1 row with condition "col is not null and col is null"	2009-11-03 17:54:41 +04:00
func_like.result	Bug#33546: Slowdown on re-evaluation of constant expressions.	2009-12-02 00:25:51 +03:00
func_math.result	Manual merge.	2010-03-19 11:29:12 +03:00
func_misc.result	Bug #52165: Assertion failed: file .\dtoa.c, line 465	2010-04-07 13:59:02 +04:00
func_op.result
func_regexp.result	Bug#30302: Tables that were optimized away are printed in the	2009-10-19 15:13:26 +04:00
func_rollback.result
func_sapdb.result	Backport to 5.6.0	2009-11-04 10:17:39 +01:00
func_set.result
func_str.result	Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.	2010-04-02 19:17:43 +04:00
func_system.result
func_test.result	Bug #8433: Overflow must be an error	2010-03-18 13:38:29 +03:00
func_time.result	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-02-22 00:33:11 +03:00
func_timestamp.result
gcc296.result
gis-rtree.result	BUG#51877 - HANDLER interface causes invalid memory read	2010-03-25 15:49:01 +04:00
gis.result	merge from mysql-trunk-bugfixing	2010-02-11 18:32:53 +01:00
grant.result	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-05-09 02:03:35 +04:00
grant2.result	merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091208092611-pbno5awyb0v38hs7	2009-12-17 00:09:52 +00:00
grant3.result	Fix for Bug #41597 - After rename of user, there are additional grants when	2009-10-20 11:47:57 +05:30
grant4.result	Patch for WL#3736: Extended Table, Column and Index Comments.	2010-02-20 13:07:32 +03:00
grant_cache_no_prot.result
grant_cache_ps_prot.result
grant_lowercase_fs.result	Bug#41049 does syntax "grant" case insensitive?	2009-10-27 12:09:19 +04:00
greedy_optimizer.result	WL#5252: Deprecate --optimizer_search_depth=63	2010-03-01 17:31:02 +01:00
group_by.result	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-05-24 00:41:18 +04:00
group_min_max.result	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-03-20 23:23:42 +03:00
group_min_max_innodb.result
handler_innodb.result	Bug #51355 handler stmt cause assertion in	2010-02-25 18:08:12 +01:00
handler_myisam.result	Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.	2010-04-02 19:17:43 +04:00
have_big5.require
have_binlog_format_mixed.require
have_binlog_format_row.require
have_binlog_format_statement.require
have_compress.require
have_cp866.require
have_cp932.require
have_cp1250_ch.require
have_cp1251.require
have_crypt.require
have_debug.require
have_debug_sync.require	WL#4259 - Debug Sync Facility	2009-09-29 17:38:40 +02:00
have_eucjpms.require
have_euckr.require
have_gb2312.require
have_gbk.require
have_geometry.require
have_koi8r.require
have_latin2_ch.require
have_local_infile.require
have_log_bin.require
have_met_timezone.require
have_moscow_leap_timezone.require
have_mysql_upgrade.result
have_ndb_extra.require
have_ndbapi_examples.require
have_nodebug.require	Bug#33637 SHOW PROCEDURE CODE/SHOW FUNCTION CODE sp_name gives a syntax error.	2009-10-29 10:51:04 -06:00
have_outfile.require
have_partition.require
have_perror.require
have_profiling.require	WL#4738 streamline/simplify @@variable creation process	2009-12-22 10:35:56 +01:00
have_query_cache.require
have_sjis.require
have_ssl.require
have_ssl_is_yes_or_disabled_only.require	Backport of:	2010-04-13 19:04:45 +04:00
have_symlink.require
have_tis620.require
have_ucs2.require
have_ujis.require
have_utf8.require
have_utf8mb4.require	Backporting WL#1213	2010-02-24 13:15:34 +04:00
have_utf16.require	Backporting WL#1213	2010-02-24 13:15:34 +04:00
have_utf32.require	Backporting WL#1213	2010-02-24 13:15:34 +04:00
having.result	Some post-merge fixes afer a merge from mysql-5.1-bugteam.	2010-04-11 14:42:05 +04:00
heap.result	Patch for WL#3736: Extended Table, Column and Index Comments.	2010-02-20 13:07:32 +03:00
heap_auto_increment.result
heap_btree.result	Patch for WL#3736: Extended Table, Column and Index Comments.	2010-02-20 13:07:32 +03:00
heap_hash.result	Patch for WL#3736: Extended Table, Column and Index Comments.	2010-02-20 13:07:32 +03:00
help.result
implicit_commit.result	Bug #51336 Assert in reload_acl_and_cache during RESET QUERY CACHE	2010-02-26 10:58:33 +01:00
index_merge_innodb.result	Fix index_merge_innodb.result (Bug 45727).	2009-10-08 13:27:45 +04:00
index_merge_myisam.result	WL#5197 "Move @@engine_condition_pushdown to @@optimizer_switch"	2010-01-06 11:54:45 +01:00
information_schema-big.result	Port of fix for BUG#42893 "main.information_schema times out sporadically"	2009-10-05 16:22:48 +02:00
information_schema.result	Patch for WL#3736: Extended Table, Column and Index Comments.	2010-02-20 13:07:32 +03:00
information_schema_chmod.result
information_schema_db.result	backported:	2010-01-15 15:42:15 +04:00
information_schema_inno.result	Bug#35427 INFORMATION_SCHEMA.TABLES.TABLE_CATALOG is NULL, should be "def"	2009-10-23 16:02:20 +05:00
information_schema_parameters.result	backported:	2010-01-15 15:42:15 +04:00
information_schema_part.result	pre push fix of test results	2010-05-26 09:56:55 +02:00
information_schema_routines.result	backported:	2010-01-15 15:42:15 +04:00
init_connect.result
init_file.result
innodb-autoinc-optimize.result
innodb-ucs2.result
innodb_autoinc_lock_mode_zero.result
innodb_bug30919.result
innodb_bug42419.result
innodb_gis.result	Backport of WL #2934: Make/find library for doing float/double	2009-12-22 19:23:13 +03:00
innodb_ignore_builtin.result
innodb_lock_wait_timeout_1.result	Bug #37183 insert ignore into .. select ... hangs after	2009-11-12 12:43:33 +01:00
innodb_mysql.result	manual merge from mysql-trunk-bugfixing	2010-06-06 13:19:29 +02:00
innodb_mysql_lock.result	Bug #53798 OPTIMIZE TABLE breaks repeatable read	2010-05-19 13:32:21 +02:00
innodb_mysql_lock2.result	Yet another follow-up for the 5.5 version of fix for	2010-05-30 13:27:44 +04:00
innodb_mysql_rbk.result
innodb_mysql_sync.result	Bug #47459 Assertion in Diagnostics_area::set_eof_status on OPTIMIZE TABLE	2010-04-15 18:53:57 +02:00
innodb_notembedded.result
innodb_timeout_rollback.result
insert.result	Backport of WL #2934: Make/find library for doing float/double	2009-12-22 19:23:13 +03:00
insert_notembedded.result	Backport of:	2009-11-20 22:51:12 +03:00
insert_select.result
insert_update.result
ipv4_as_ipv6.result	Improvements to reduce the output for better reading and more stability.	2009-11-26 09:03:04 +01:00
ipv6.result	New patch for bug#49579, now with "have_ipv4_mapped.inc".	2010-01-29 11:48:11 +01:00
is_debug_build.require
is_embedded.require
isam.result
join.result	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-04-30 00:33:06 +04:00
join_crash.result
join_nested.result
join_optimizer.result	Back-port from 6.0 of the fix for	2009-10-19 15:14:43 +02:00
join_outer.result	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-05-09 02:03:35 +04:00
join_outer_innodb.result
key.result	Patch for WL#3736: Extended Table, Column and Index Comments.	2010-02-20 13:07:32 +03:00
key_cache.result	WL#4738 streamline/simplify @@variable creation process	2009-12-22 10:35:56 +01:00
key_diff.result
key_primary.result
keywords.result
kill.result	Initial import of WL#3726 "DDL locking for all metadata objects".	2009-11-30 18:55:03 +03:00
limit.result
loaddata.result	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-05-07 20:17:55 +04:00
loaddata_autocom_innodb.result
loadxml.result	Bug#51571 load xml infile causes server crash	2010-05-05 14:34:20 +04:00
locale.result	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-02-22 00:33:11 +03:00
lock.result	Implement new type-of-operation-aware metadata locks.	2010-02-01 14:43:06 +03:00
lock_multi.result	Bug #51240 ALTER TABLE of a locked MERGE table fails	2010-02-26 13:40:25 +01:00
lock_multi_bug38499.result
lock_multi_bug38691.result
lock_sync.result	Yet another follow-up for the 5.5 version of fix for	2010-05-30 13:27:44 +04:00
lock_tables_lost_commit.result
log_state.result	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-05-24 00:41:18 +04:00
log_state_bug33693.result	Bug #33693 general log name and location depend on PID file,	2009-10-12 15:35:30 +02:00
log_tables-big.result
log_tables.result	minimal changes to errmst-utf8.txt (mostly whitespace) to match 6.0-codebase better	2009-12-22 12:02:52 +01:00
log_tables_debug.result
log_tables_upgrade.result	Bug#49823: mysql_upgrade fatal error due to general_log / slow_low CSV NULL	2010-02-26 09:22:48 -03:00
long_tmpdir.result
lowercase0.require
lowercase1.require
lowercase2.require
lowercase_fs_off.result	Manual merge from mysql-trunk-merge.	2009-11-06 17:20:27 +03:00
lowercase_mixed_tmpdir.result
lowercase_mixed_tmpdir_innodb.result
lowercase_table.result
lowercase_table2.result	Backport of revno: 2617.68.3	2009-12-10 12:46:16 +01:00
lowercase_table3.result
lowercase_table_grant.result
lowercase_table_qcache.result
lowercase_utf8.result
lowercase_view.result
mdl_sync.result	manual merge from mysql-trunk-bugfixing	2010-06-06 13:19:29 +02:00
merge-big.result
merge.result	Backport of	2010-05-31 17:38:02 +04:00
merge_innodb.result
merge_recover.result	Backport of revid 2617.69.21, 2617.69.22, 2617.29.23:	2009-12-08 16:57:25 +03:00
metadata.result	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
mix2_myisam.result	Patch for WL#3736: Extended Table, Column and Index Comments.	2010-02-20 13:07:32 +03:00
mix2_myisam_ucs2.result
multi_statement.result
multi_update.result	Manual merge from mysql-trunk-merge.	2010-02-24 16:52:27 +03:00
multi_update2.result
multi_update_tiny_hash.result
myisam-blob.result
myisam-system.result
myisam.result	Manual merge from mysql-trunk.	2010-04-27 13:58:21 +04:00
myisam_crash_before_flush_keys.result	Backport from 6.0-codebase.	2009-11-25 16:25:01 +04:00
myisam_debug.result
myisampack.result	Fix for a bug when backporting/merging Bug#36573	2009-11-26 13:47:55 +01:00
mysql-bug41486.result
mysql-bug45236.result
mysql.result	Manual merge from mysql-next-mr.	2010-01-18 23:19:19 +03:00
mysql_client_test.result	Backporting a patch for Bug#43358 from 6.0 to trunk-bugfixing.	2010-05-19 16:33:51 +04:00
mysql_comments.result
mysql_cp932.result
mysql_locale_posix.result	A postfix for WL#1349	2009-10-27 08:38:32 +04:00
mysql_protocols.result
mysql_upgrade.result	Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.	2009-12-11 19:40:58 +03:00
mysqladmin.result
mysqlbinlog-cp932.result
mysqlbinlog.result	Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.	2010-04-03 21:35:51 +04:00
mysqlbinlog2.result	merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge	2010-01-07 15:39:11 +00:00
mysqlbinlog_base64.result
mysqlbinlog_row.result	result updates for the 'row-only' tests	2009-11-15 23:19:53 +04:00
mysqlbinlog_row_big.result
mysqlbinlog_row_innodb.result	BUG#49618: Field length stored incorrectly in binary log	2010-03-22 13:10:18 +01:00
mysqlbinlog_row_myisam.result	BUG#51716 post push fix.	2010-03-12 12:42:30 +00:00
mysqlbinlog_row_trans.result	merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge	2010-01-07 15:39:11 +00:00
mysqlcheck.result	backported:	2010-01-15 15:42:15 +04:00
mysqld--help-notwin.result	Some post-merge fixes afer a merge from mysql-5.1-bugteam.	2010-04-11 14:42:05 +04:00
mysqld--help-win.result	Some post-merge fixes afer a merge from mysql-5.1-bugteam.	2010-04-11 14:42:05 +04:00
mysqldump-compat.result
mysqldump-max.result
mysqldump-no-binlog.result
mysqldump.result	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-05-09 02:03:35 +04:00
mysqldump_restore.result
mysqlhotcopy_archive.result	Patch for trunk after merge from 5.1-bugteam of bug52913.	2010-06-03 11:27:27 +02:00
mysqlhotcopy_myisam.result	Patch for trunk after merge from 5.1-bugteam of bug52913.	2010-06-03 11:27:27 +02:00
mysqlshow.result	Check in the support for Information Schema System Table Views. Users	2010-05-25 18:44:33 -07:00
mysqlslap.result
mysqltest.result	Bug #50618 Please allow 'sleep $variable' in mtr	2010-02-09 18:13:57 +01:00
named_pipe.result	Patch for WL#3736: Extended Table, Column and Index Comments.	2010-02-20 13:07:32 +03:00
ndb_default_cluster.require
negation_elimination.result
no-threads.result
no_binlog.result	BUG#50780: 'show binary logs' debug assertion when binary	2010-02-05 17:51:55 +00:00
not_embedded.require
not_embedded_server.result	Backport of revno ## 2617.31.1, 2617.31.3, 2617.31.4, 2617.31.5,	2009-12-05 02:02:48 +03:00
not_ndb.require
not_ndb_default.require
not_openssl.require
not_partition.require
not_partition.result	fixed "engine not found" error in open_binary_frm	2009-12-23 13:06:03 +01:00
not_true.require
not_valgrind.require
not_windows.require
null.result	Patch for Bug#50511 (Sometimes wrong handling of user variables containing NULL).	2010-05-05 15:00:59 +04:00
null_key.result
odbc.result	Bug#41371 Select returns 1 row with condition "col is not null and col is null"	2009-11-03 17:54:41 +04:00
olap.result	Automerge.	2009-11-06 17:54:19 +03:00
one_thread_per_connection.require
openssl_1.result	merge	2010-01-29 16:54:27 +02:00
optimizer_switch_eng_cond_pushdown1.result	WL#5197 "Move @@engine_condition_pushdown to @@optimizer_switch"	2010-01-06 11:54:45 +01:00
optimizer_switch_eng_cond_pushdown2.result	WL#5197 "Move @@engine_condition_pushdown to @@optimizer_switch"	2010-01-06 11:54:45 +01:00
order_by.result	Bug #38745: MySQL 5.1 optimizer uses filesort for ORDER BY	2010-05-31 16:52:19 +04:00
order_fill_sortbuf.result
outfile.result	Bug#27145 EXTRA_ACL troubles	2009-10-19 14:58:13 +02:00
outfile_loaddata.result	Bug #53088: mysqldump with -T & --default-character-set set	2010-05-07 00:41:37 +04:00
overflow.result
packet.result
parser.result	Backport of WL #2934: Make/find library for doing float/double	2009-12-22 19:23:13 +03:00
parser_bug21114_innodb.result
parser_not_embedded.result
parser_precedence.result
parser_stack.result
partition.result	Auto-merge from mysql-trunk.	2010-05-28 09:47:58 +04:00
partition_archive.result
partition_binlog_stmt.result	Bug#51851: Server with SBR locks mutex twice on LOAD DATA	2010-03-30 22:52:45 +02:00
partition_blackhole.result
partition_bug18198.result	Bug #42849: innodb crash with varying time_zone on partitioned	2009-12-13 23:29:50 +03:00
partition_charset.result
partition_column.result	pre push fix of test results	2010-05-26 09:56:55 +02:00
partition_column_prune.result	Initial import of WL#3726 "DDL locking for all metadata objects".	2009-11-30 18:55:03 +03:00
partition_csv.result
partition_datatype.result	BUG#48165, needed to introduce length restrictions on partitioning fields to ensure that no stack overruns occur	2009-10-28 01:11:17 +01:00
partition_debug_sync.result	manual merge fix of bug#42438 in mysql-next-mr-merge	2010-03-02 00:05:30 +01:00
partition_disabled.result
partition_error.result	merge	2010-05-25 17:26:48 +02:00
partition_federated.result
partition_grant.result
partition_hash.result	Backport of the fix for BUG#33730 "Full table scan instead selected partitions for query more than 10 partitions"	2009-10-05 22:59:19 +02:00
partition_innodb.result	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
partition_innodb_plugin.result
partition_innodb_semi_consistent.result	Bug#42643: InnoDB does not support replication of TRUNCATE TABLE	2010-05-25 17:01:38 -03:00
partition_innodb_stmt.result	BUG#50670: Slave stops with error code 1644	2010-04-28 14:47:49 +02:00
partition_key_cache.result	WL#4738 streamline/simplify @@variable creation process	2009-12-22 10:35:56 +01:00
partition_list.result	Fixed Information schema for column list partitioned tables	2009-10-21 20:04:34 +02:00
partition_mgm.result
partition_mgm_err.result
partition_mgm_err2.result
partition_not_embedded.result
partition_not_windows.result	Removed column_list and fixed all issues relating to this change	2009-10-21 12:40:21 +02:00
partition_open_files_limit.result	Bug#46922: crash when adding partitions and open_files_limit	2009-10-08 15:36:43 +02:00
partition_order.result
partition_pruning.result	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
partition_range.result	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-03-20 23:23:42 +03:00
partition_rename_longfilename.result
partition_symlink.result	Removed column_list and fixed all issues relating to this change	2009-10-21 12:40:21 +02:00
partition_sync.result	Backport of revno: 2617.80.1	2009-12-10 14:41:41 +01:00
partition_truncate.result
partition_utf8.result	BUG#49591, Fixed version string in SHOW CREATE TABLE to accomodate for column list partitioning and new function to_seconds	2009-12-17 18:39:10 +01:00
partition_windows.result
perror-win.result	Fixed tests for windows	2010-02-24 00:22:19 -07:00
perror.result	Bug#10143 Perror not showing error description	2010-02-23 17:45:49 -07:00
plugin.result	minimal changes to errmst-utf8.txt (mostly whitespace) to match 6.0-codebase better	2009-12-22 12:02:52 +01:00
plugin_load.result
plugin_not_embedded.result	Post-merge fix: remove unnecessary flush privileges.	2010-03-13 18:32:42 -03:00
preload.result
profiling.result	WL#4738 streamline/simplify @@variable creation process	2009-12-22 10:35:56 +01:00
ps.result	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-05-07 20:17:55 +04:00
ps_1general.result	Patch for WL#3736: Extended Table, Column and Index Comments.	2010-02-20 13:07:32 +03:00
ps_2myisam.result	WL#2649 Number-to-string conversions	2010-02-11 08:17:25 +04:00
ps_3innodb.result	WL#2649 Number-to-string conversions	2010-02-11 08:17:25 +04:00
ps_4heap.result	WL#2649 Number-to-string conversions	2010-02-11 08:17:25 +04:00
ps_5merge.result	WL#2649 Number-to-string conversions	2010-02-11 08:17:25 +04:00
ps_10nestset.result
ps_11bugs.result
ps_ddl.result	Patch for WL#3736: Extended Table, Column and Index Comments.	2010-02-20 13:07:32 +03:00
ps_ddl1.result	Apply and review:	2009-12-29 15:19:05 +03:00
ps_grant.result	5.0-bugteam->5.1-bugteam merge	2009-10-27 14:09:36 +04:00
ps_not_windows.result
query_cache.result	Bug #51336 Assert in reload_acl_and_cache during RESET QUERY CACHE	2010-02-26 10:58:33 +01:00
query_cache_28249.result
query_cache_debug.result
query_cache_disabled.result	post commit fix: missing result file.	2009-10-29 17:18:09 +01:00
query_cache_merge.result
query_cache_notembedded.result	Backport of:	2009-11-20 22:51:12 +03:00
query_cache_ps_no_prot.result	WL#4738 streamline/simplify @@variable creation process	2009-12-22 10:35:56 +01:00
query_cache_ps_ps_prot.result	WL#4738 streamline/simplify @@variable creation process	2009-12-22 10:35:56 +01:00
query_cache_with_views.result	Bug#46615 Assertion in Query_cache::invalidate in INSERT in a VIEW of a MERGE table	2010-03-24 17:37:41 +01:00
raid.result
range.result	Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.	2010-05-11 12:27:53 +04:00
read_many_rows_innodb.result
read_only.result
read_only_innodb.result	Bug#33669: Transactional temporary tables do not work under --read-only	2010-03-10 10:36:40 -03:00
rename.result	Patch that addresses bug #53976 "ALTER TABLE RENAME	2010-05-28 09:25:11 +04:00
renamedb.result	Bug #53804: serious flaws in the alter database .. upgrade	2010-05-21 22:47:32 +04:00
repair.result	Patch for WL#3736: Extended Table, Column and Index Comments.	2010-02-20 13:07:32 +03:00
replace.result
rollback.result
round.result
row.result	Bug#52124 memory leaks like a sieve in datetime, timestamp, time, date fields + warnings	2010-04-16 16:42:34 +05:00
rowid_order_innodb.result
rpl_colSize.result
rpl_extraColmaster_innodb.result
rpl_extraColmaster_myisam.result
rpl_mysqldump_slave.result	BUG #8368 "mysqldump needs --slave-data option"	2009-11-04 14:31:03 +01:00
schema.result	Merge next-mr -> next-4284-merge.	2010-02-04 20:34:15 +03:00
select.result	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
select_found.result
select_safe.result	WL#4738 streamline/simplify @@variable creation process	2009-12-22 10:35:56 +01:00
server_id.require
server_id1.require
shm.result	Patch for WL#3736: Extended Table, Column and Index Comments.	2010-02-20 13:07:32 +03:00
show_check.result	Backporting a test case for Bug#30036 (SHOW TABLE TYPES causes the debug client	2010-05-21 17:36:59 +04:00
show_profile.result	Bug#50057: SHOW PROFILE CPU for Windows	2010-02-05 17:31:34 +01:00
signal.result	Bug#31767 DROP FUNCTION name resolution	2010-02-23 11:43:26 -07:00
signal_code.result	Manual resolving for the following files	2009-12-01 21:07:18 +02:00
signal_demo1.result
signal_demo2.result
signal_demo3.result	Fix test results after the latest merge.	2009-10-14 15:36:55 +04:00
signal_sqlmode.result
skip_grants.result
skip_log_bin.result
skip_name_resolve.result	Bug #37168: Missing variable - skip_name_resolve	2010-03-31 16:12:37 +03:00
slave-running.result
slave-stopped.result
sp-big.result
sp-bugs.result	Bug#50624: crash in check_table_access during call procedure	2010-02-13 08:35:14 -02:00
sp-code.result	Manual resolving for the following files	2009-12-01 21:07:18 +02:00
sp-destruct.result	Bug #51376 Assert `! is_set()' failed in	2010-03-03 10:24:53 +01:00
sp-dynamic.result
sp-error.result	Bug#31767 DROP FUNCTION name resolution	2010-02-23 11:43:26 -07:00
sp-fib.result
sp-lock.result	Additional test coverage for	2010-04-19 15:35:13 +02:00
sp-no-code.result	Bug#33637 SHOW PROCEDURE CODE/SHOW FUNCTION CODE sp_name gives a syntax error.	2009-10-29 10:51:04 -06:00
sp-prelocking.result
sp-security.result	merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091208092611-pbno5awyb0v38hs7	2009-12-17 00:09:52 +00:00
sp-threads.result	Implement new type-of-operation-aware metadata locks.	2010-02-01 14:43:06 +03:00
sp-ucs2.result	backported:	2010-01-15 15:42:15 +04:00
sp-vars.result	Bug#31767 DROP FUNCTION name resolution	2010-02-23 11:43:26 -07:00
sp.result	Patch for Bug#21818 (Return value of ROW_COUNT() is incorrect	2010-05-14 09:28:51 +04:00
sp_gis.result
sp_notembedded.result	Manual merge from mysql-trunk-merge.	2010-02-24 16:52:27 +03:00
sp_stress_case.result
sp_sync.result	Additional test coverage for	2010-04-19 15:35:13 +02:00
sp_trans.result	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-02-22 00:33:11 +03:00
sp_trans_log.result	fixing tests results: rpl_ndb_log, rpl_ndb_multi, sp_trans_log; adding replicate-ignore_server_ids specific tests	2009-10-02 16:15:54 +03:00
sql_mode.result	Bug #21099 MySQL 5.0.22 silently creates MyISAM tables even though	2009-10-09 16:52:02 +02:00
ssl-big.result
ssl.result	Patch for WL#3736: Extended Table, Column and Index Comments.	2010-02-20 13:07:32 +03:00
ssl_8k_key.result
ssl_compress.result	Patch for WL#3736: Extended Table, Column and Index Comments.	2010-02-20 13:07:32 +03:00
ssl_connect.result
status.result	Backport of:	2009-11-20 23:30:00 +03:00
status2.result
strict.result	Manual merge.	2010-03-19 11:29:12 +03:00
strict_autoinc_1myisam.result
strict_autoinc_2innodb.result
strict_autoinc_3heap.result
subselect.result	Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.	2010-04-03 21:55:04 +04:00
subselect2.result
subselect3.result	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
subselect4.result	merge	2009-09-28 16:48:40 +03:00
subselect_debug.result
subselect_gis.result
subselect_innodb.result
subselect_notembedded.result
sum_distinct-big.result
sum_distinct.result
symlink.result	BUG#40980 - Drop table can remove another MyISAM table's	2010-04-01 18:49:02 +04:00
synchronization.result
sysdate_is_now.result
system_mysql_db.result	Manual merge from mysql-trunk-merge.	2009-11-06 17:20:27 +03:00
system_mysql_db_refs.result
tablelock.result
temp_table.result
testdb_only.require
timezone.result
timezone2.result
timezone3.result
timezone4.result
timezone_grant.result
trigger-compat.result	backported:	2010-01-15 15:42:15 +04:00
trigger-trans.result
trigger.result	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-05-09 02:03:35 +04:00
trigger_notembedded.result	backported:	2010-01-15 15:42:15 +04:00
true.require
truncate.result	Bug#42643: InnoDB does not support replication of TRUNCATE TABLE	2010-05-25 17:01:38 -03:00
truncate_coverage.result	Implement new type-of-operation-aware metadata locks.	2010-02-01 14:43:06 +03:00
type_binary.result	Bug#52430 Incorrect key in the error message for duplicate key error involving BINARY type	2010-05-27 20:01:43 +04:00
type_bit.result	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-02-22 00:33:11 +03:00
type_bit_innodb.result
type_blob.result	Bug#47974 'TYPE=storage_engine' is deprecated and will be	2010-02-09 11:30:50 +01:00
type_date.result	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-03-20 23:23:42 +03:00
type_datetime.result	Bug#52849 [Com]: datetime index not work	2010-05-05 13:28:37 +04:00
type_decimal.result	Bug#52168 decimal casting catastrophes: crashes and valgrind errors on simple casts	2010-05-28 17:30:39 +02:00
type_enum.result
type_float.result	Backport of WL #2934: Make/find library for doing float/double	2009-12-22 19:23:13 +03:00
type_nchar.result
type_newdecimal-big.result
type_newdecimal.result	Bug #8433: Overflow must be an error	2010-03-18 13:38:29 +03:00
type_ranges.result	Mergine from mysql-next-me	2010-02-27 11:43:32 +04:00
type_set.result
type_time.result	Bug#42664: Sign ignored for TIME types when not comparing as longlong	2009-11-04 11:28:50 +01:00
type_timestamp.result	Bug#50888 valgrind warnings in Field_timestamp::val_str	2010-03-09 15:54:12 +01:00
type_uint.result
type_varchar.result	Merge next-mr -> next-4284	2009-12-16 10:48:07 +03:00
type_year.result	Bug #49910: Behavioural change in SELECT/WHERE on YEAR(4) data type	2010-03-22 12:33:25 +04:00
udf.result	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
udf_skip_grants.result
union.result	Manual merge of mysql-trunk into mysql-trunk-merge.	2010-03-24 18:03:44 +03:00
unsafe_binlog_innodb.result
update.result	Bug#50545: Single table UPDATE IGNORE crashes on	2010-03-10 17:10:05 +01:00
upgrade.result	Bug #53804: serious flaws in the alter database .. upgrade	2010-05-21 22:47:32 +04:00
user_limits.result	WL#4738 streamline/simplify @@variable creation process	2009-12-22 10:35:56 +01:00
user_var-binlog.result	merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge	2010-01-07 15:39:11 +00:00
user_var.result	Patch for Bug#50511 (Sometimes wrong handling of user variables containing NULL).	2010-05-05 15:00:59 +04:00
varbinary.result
variables-big.result
variables-notembedded.result
variables.result	Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.	2010-04-03 21:35:51 +04:00
variables_community.result	renaming test variables+c to variables_community, + is problematic	2010-02-11 14:26:58 +01:00
variables_debug.result	Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.	2010-05-24 00:41:18 +04:00
view.result	manual merge from mysql-trunk-bugfixing	2010-06-06 13:19:29 +02:00
view_alias.result	Bug#40277: SHOW CREATE VIEW returns invalid SQL	2010-03-09 07:36:26 -03:00
view_grant.result	Manual merge from mysql-trunk-merge.	2010-02-24 16:52:27 +03:00
wait_timeout.result
warnings.result	Bug#31767 DROP FUNCTION name resolution	2010-02-23 11:43:26 -07:00
warnings_engine_disabled.result	minimal changes to errmst-utf8.txt (mostly whitespace) to match 6.0-codebase better	2009-12-22 12:02:52 +01:00
windows.require
windows.result
xa.result	Merge an addition to BUG51342 5.0-bugteam -> 5.1-bugteam.	2010-03-10 19:31:22 +04:00
xml.result