Jon Olav Hauglid a776e5f3d2 Merge from mysql-5.5-bugteam to mysql-5.5-runtime ... No conflicts		2010-10-21 16:28:29 +02:00
..
1st.test
alias.test
almost_full.test
alter_table-big.test
alter_table.test
analyze.test
ansi.test
archive-big.test
archive.test
archive_bitfield.test
archive_gis.test
archive_plugin-master.opt
archive_plugin.test
auto_increment.test
bench_count_distinct.test
bigint.test
binary.test
blackhole_plugin-master.opt
blackhole_plugin.test
bool.test
bootstrap-master.opt
bootstrap.test
bug39022.test
bug46080-master.opt
bug46080.test
bug46261-master.opt
bug46261.test
bug46760-master.opt
bug46760.test
bug47671-master.opt
bug47671.test
bulk_replace.test
cache_innodb-master.opt
cache_innodb.test
case.test
cast.test
change_user-master.opt
change_user.test
check.test
client_xml.test
comment_column.test
comment_column2.test
comment_index.test
comment_table.test
comments.test
commit.test
commit_1innodb.test
compare.test
compress.test
concurrent_innodb_safelog-master.opt
concurrent_innodb_safelog.test
concurrent_innodb_unsafelog-master.opt
concurrent_innodb_unsafelog.test
connect.test
consistent_snapshot.test
constraints.test
contributors.test
count_distinct.test
count_distinct2-master.opt
count_distinct2.test
count_distinct3.test
crash_commit_before-master.opt
crash_commit_before.test
create-big.test
create.test
create_not_windows.test
create_select_tmp.test
csv.test
csv_alter_table.test
csv_not_null.test
ctype_ascii.test
ctype_big5.test
ctype_binary.test
ctype_collate.test
ctype_cp932_binlog_row.test
ctype_cp932_binlog_stm.test
ctype_cp1250_ch.test
ctype_cp1251.test
ctype_create.test
ctype_errors.test
ctype_eucjpms.test
ctype_euckr.test
ctype_filename.test
ctype_filesystem-master.opt
ctype_filesystem.test
ctype_gb2312.test
ctype_gbk.test
ctype_gbk_binlog.test
ctype_hebrew.test
ctype_latin1.test
ctype_latin1_de-master.opt
ctype_latin1_de.test
ctype_latin2.test
ctype_latin2_ch.test
ctype_ldml-master.opt
ctype_ldml.test
ctype_many.test
ctype_mb.test
ctype_recoding.test
ctype_sjis.test
ctype_tis620.test
ctype_uca.test
ctype_ucs.test
ctype_ucs2_def-master.opt
ctype_ucs2_def.test
ctype_ujis.test
ctype_ujis_ucs2.test
ctype_utf8-master.opt
ctype_utf8.test
ctype_utf8mb4-master.opt
ctype_utf8mb4.test
ctype_utf8mb4_heap.test
ctype_utf8mb4_innodb-master.opt
ctype_utf8mb4_innodb.test
ctype_utf8mb4_myisam.test
ctype_utf8mb4_ndb.test
ctype_utf16.test
ctype_utf16_def-master.opt
ctype_utf16_def.test
ctype_utf16_uca.test
ctype_utf32.test
ctype_utf32_uca.test
date_formats-master.opt
date_formats.test
ddl_i18n_koi8r.test
ddl_i18n_utf8.test
deadlock_innodb.test
debug_sync.test
default.test
delayed.test
delete.test
deprecated_features.test
derived.test
dirty_close.test
disabled.def
distinct.test
drop-no_root.test
drop.test
drop_debug.test
empty_table.test
endspace.test
error_simulation.test
errors.test
events_1.test
events_2.test
events_bugs-master.opt
events_bugs.test
events_embedded.test
events_grant.test
events_logs_tests-master.opt
events_logs_tests.test
events_microsec.test
events_restart-master.opt
events_restart.test
events_scheduling.test
events_stress.test
events_time_zone.test
events_trans.test
events_trans_notembedded.test
execution_constants.test
explain.test
fix_priv_tables.test
flush.test
flush2-master.opt
flush2.test
flush_block_commit.test
flush_block_commit_notembedded.test
flush_read_lock_kill-master.opt
flush_read_lock_kill.test
flush_table.test
foreign_key.test
fulltext.test
fulltext2.test
fulltext3.test
fulltext_cache.test
fulltext_distinct.test
fulltext_left_join.test
fulltext_multi.test
fulltext_order_by.test
fulltext_plugin-master.opt
fulltext_plugin.test
fulltext_update.test
fulltext_var.test
func_analyse.test
func_compress.test
func_concat.test
func_crypt.test
func_date_add.test
func_default.test
func_des_encrypt.test
func_digest.test
func_encrypt-master.opt
func_encrypt.test
func_encrypt_nossl.test
func_equal.test
func_gconcat.test
func_group.test
func_group_innodb.test
func_if.test
func_in.test
func_isnull.test
func_like.test
func_math.test
func_misc.test
func_op.test
func_regexp.test
func_rollback.test
func_sapdb.test
func_set.test
func_str.test
func_system.test
func_test.test
func_time.test
func_timestamp.test
gcc296.test
gis-rtree.test
gis.test
grant.test
grant2.test
grant3-master.opt
grant3.test
grant4.test
grant_cache_no_prot.test
grant_cache_ps_prot.test
grant_lowercase_fs.test
greedy_optimizer.test
group_by.test
group_min_max.test
group_min_max_innodb.test
handler_innodb.test
handler_myisam.test
handler_read_last.test
having.test
heap.test
heap_auto_increment.test
heap_btree.test
heap_hash.test
help.test
implicit_commit-master.opt
implicit_commit.test
index_merge_innodb.test
index_merge_myisam.test
information_schema-big.test
information_schema.test
information_schema_chmod.test
information_schema_db.test
information_schema_inno.test
information_schema_parameters.test
information_schema_part.test
information_schema_routines.test
init_connect-master.opt
init_connect.test
init_file-master.opt
init_file.test
innodb_ignore_builtin-master.opt
innodb_ignore_builtin.test
innodb_mysql_lock-master.opt
innodb_mysql_lock.test
innodb_mysql_lock2.test
innodb_mysql_sync.test
insert.test
insert_notembedded.test
insert_select.test
insert_update.test
ipv4_as_ipv6-master.opt
ipv4_as_ipv6.test
ipv6-master.opt
ipv6.test
join.test
join_crash.test
join_nested.test
join_optimizer.test
join_outer.test
join_outer_innodb.test
key.test
key_cache-master.opt
key_cache.test
key_diff.test
key_primary.test
keywords.test
kill.test
limit.test
loaddata.test
loaddata_autocom_innodb.test
loadxml.test
locale.test
lock.test
lock_multi.test
lock_multi_bug38499.test
lock_multi_bug38691.test
lock_sync-master.opt
lock_sync.test
lock_tables_lost_commit-master.opt
lock_tables_lost_commit.test
log_state-master.opt
log_state.test
log_state_bug33693-master.opt
log_state_bug33693.test
log_tables-big-master.opt
log_tables-big.test
log_tables-master.opt
log_tables.test
log_tables_debug.test
log_tables_upgrade.test
long_tmpdir-master.opt
long_tmpdir-master.sh
long_tmpdir.test
lowercase_fs_off.test
lowercase_mixed_tmpdir-master.opt
lowercase_mixed_tmpdir-master.sh
lowercase_mixed_tmpdir.test
lowercase_mixed_tmpdir_innodb-master.opt
lowercase_mixed_tmpdir_innodb-master.sh
lowercase_mixed_tmpdir_innodb.test
lowercase_table-master.opt
lowercase_table.test
lowercase_table2.test
lowercase_table3-master.opt
lowercase_table3.test
lowercase_table4-master.opt
lowercase_table4.test
lowercase_table_grant-master.opt
lowercase_table_grant.test
lowercase_table_qcache-master.opt
lowercase_table_qcache.test
lowercase_utf8-master.opt
lowercase_utf8.test
lowercase_view-master.opt
lowercase_view.test
mdl_sync-master.opt
mdl_sync.test
merge-big.test
merge.test
merge_innodb.test
merge_mmap-master.opt
merge_mmap.test
merge_recover-master.opt
merge_recover.test
metadata.test
mix2_myisam.test
mix2_myisam_ucs2.test
multi_statement-master.opt
multi_statement.test
multi_update-master.opt
multi_update.test
multi_update2-master.opt
multi_update2.test
multi_update_tiny_hash-master.opt
multi_update_tiny_hash.test
myisam-blob-master.opt
myisam-blob.test
myisam-system.test
myisam.test
myisam_crash_before_flush_keys-master.opt
myisam_crash_before_flush_keys.test
myisam_debug.test
myisampack.test
mysql-bug41486.test
mysql-bug45236.test
mysql.test
mysql_client_test-master.opt
mysql_client_test.test
mysql_comments.sql
mysql_comments.test
mysql_cp932.test
mysql_delimiter.sql
mysql_delimiter_19799.sql
mysql_delimiter_source.sql
mysql_locale_posix.test
mysql_not_windows.test
mysql_protocols.test
mysql_upgrade.test
mysql_upgrade_ssl.test
mysqladmin.test
mysqlbinlog-cp932-master.opt
mysqlbinlog-cp932.test
mysqlbinlog-master.opt
mysqlbinlog.test
mysqlbinlog2.test
mysqlbinlog_base64.test
mysqlbinlog_row.test
mysqlbinlog_row_big.test
mysqlbinlog_row_innodb.test
mysqlbinlog_row_myisam.test
mysqlbinlog_row_trans.test
mysqlcheck.test
mysqld--help-notwin.test
mysqld--help-win.test
mysqldump-compat.opt
mysqldump-compat.test
mysqldump-max-master.opt
mysqldump-max.test
mysqldump-no-binlog-master.opt
mysqldump-no-binlog.test
mysqldump.test
mysqldump_restore.test
mysqlhotcopy_archive.test
mysqlhotcopy_myisam.test
mysqlshow.test
mysqlslap.test
mysqltest.test
named_pipe-master.opt
named_pipe.test
negation_elimination.test
no-threads-master.opt
no-threads.test
no_binlog.test
not_embedded_server-master.opt
not_embedded_server.test
not_partition.test
null.test
null_key.test
odbc.test
olap.test
openssl_1.test
optimizer_switch_eng_cond_pushdown1-master.opt
optimizer_switch_eng_cond_pushdown1.test
optimizer_switch_eng_cond_pushdown2-master.opt
optimizer_switch_eng_cond_pushdown2.test
order_by.test
order_fill_sortbuf-master.opt
order_fill_sortbuf.test
outfile.test
outfile_loaddata.test
overflow.test
packet.test
parser.test
parser_bug21114_innodb.test
parser_not_embedded.test
parser_precedence.test
parser_stack.test
partition-master.opt
partition.test
partition_archive.test
partition_binlog_stmt.test
partition_blackhole.test
partition_bug18198.test
partition_charset.test
partition_column.test
partition_column_prune.test
partition_csv.test
partition_datatype.test
partition_debug_sync.test
partition_disabled-master.opt
partition_disabled.test
partition_error.test
partition_federated.test
partition_grant.test
partition_hash.test
partition_innodb.test
partition_innodb_plugin.test
partition_innodb_semi_consistent-master.opt
partition_innodb_semi_consistent.test
partition_innodb_stmt.test
partition_key_cache.test
partition_list.test
partition_mgm.test
partition_mgm_err.test
partition_mgm_err2.test
partition_not_blackhole-master.opt
partition_not_blackhole.test
partition_not_embedded.test
partition_not_windows-master.opt
partition_not_windows.test
partition_open_files_limit-master.opt
partition_open_files_limit.test
partition_order.test
partition_pruning.test
partition_range.test
partition_rename_longfilename.test
partition_symlink.test
partition_sync.test
partition_truncate.test
partition_utf8.test
partition_windows.test
perror-win.test
perror.test
plugin-master.opt
plugin.test
plugin_auth-master.opt
plugin_auth.test
plugin_auth_qa-master.opt	due to merge	2010-10-20 16:56:09 +02:00
plugin_auth_qa.test	due to merge	2010-10-20 16:56:09 +02:00
plugin_auth_qa_1-master.opt	due to merge	2010-10-20 16:56:09 +02:00
plugin_auth_qa_1.test	due to merge	2010-10-20 16:56:09 +02:00
plugin_auth_qa_2-master.opt	due to merge	2010-10-20 16:56:09 +02:00
plugin_auth_qa_2.test	due to merge	2010-10-20 16:56:09 +02:00
plugin_auth_qa_3-master.opt	due to merge	2010-10-20 16:56:09 +02:00
plugin_auth_qa_3.test	due to merge	2010-10-20 16:56:09 +02:00
plugin_load-master.opt
plugin_load.test
plugin_load_option-master.opt
plugin_load_option.test
plugin_not_embedded-master.opt
plugin_not_embedded.test
preload.test
profiling.test
ps-master.opt
ps.test
ps_1general.test
ps_2myisam.test
ps_3innodb-master.opt
ps_3innodb.test
ps_4heap.test
ps_5merge.test
ps_10nestset.test
ps_11bugs.test
ps_ddl.test
ps_ddl1.test
ps_grant.test
ps_not_windows.test
query_cache.test
query_cache_28249.test
query_cache_debug.test
query_cache_disabled-master.opt
query_cache_disabled.test
query_cache_merge.test
query_cache_notembedded.test
query_cache_ps_no_prot.test
query_cache_ps_ps_prot.test
query_cache_with_views.test
range.test
read_many_rows_innodb.test
read_only.test
read_only_innodb.test
rename.test
renamedb.test
repair.test
replace.test
rollback.test
round.test
row.test
rowid_order_innodb.test
rpl_mysqldump_slave.test
schema.test
select.test
select_found.test
select_safe.test
shm-master.opt
shm.test
show_check-master.opt
show_check.test
show_profile.test
signal.test
signal_code.test
signal_demo1.test
signal_demo2.test
signal_demo3.test
signal_sqlmode.test
single_delete_update.test
skip_grants-master.opt
skip_grants.test
skip_log_bin-master.opt
skip_log_bin.test
skip_name_resolve-master.opt
skip_name_resolve.test
sp-big.test
sp-bugs.test
sp-code.test
sp-destruct.test
sp-dynamic.test
sp-error.test
sp-fib.test
sp-lock.test
sp-no-code.test
sp-prelocking.test
sp-security.test
sp-threads.test
sp-ucs2.test
sp-vars.test
sp.test
sp_gis.test
sp_notembedded.test
sp_stress_case.test
sp_sync.test
sp_trans.test
sp_trans_log.test
sql_mode.test
ssl-big.test
ssl.test
ssl_8k_key-master.opt
ssl_8k_key.test
ssl_compress.test
ssl_connect.test
status-master.opt
status.test
status2.test
strict-master.opt
strict.test
strict_autoinc_1myisam.test
strict_autoinc_2innodb.test
strict_autoinc_3heap.test
subselect.test
subselect2.test
subselect3.test
subselect4.test
subselect_debug.test
subselect_gis.test
subselect_innodb.test
subselect_notembedded.test
sum_distinct-big.test
sum_distinct.test
symlink.test
synchronization.test
sysdate_is_now-master.opt
sysdate_is_now.test
system_mysql_db.test
system_mysql_db_fix30020-master.opt
system_mysql_db_fix40123-master.opt
system_mysql_db_fix40123.test
system_mysql_db_fix50030-master.opt
system_mysql_db_fix50030.test
system_mysql_db_fix50117-master.opt
system_mysql_db_fix50117.test
system_mysql_db_refs.test
tablelock.test
temp_table-master.opt
temp_table.test
timezone-master.opt
timezone.test
timezone2.test
timezone3-master.opt
timezone3.test
timezone4-master.opt
timezone4.test
timezone_grant.test
trigger-compat.test
trigger-trans.test
trigger.test
trigger_notembedded.test
truncate.test
truncate_coverage.test
type_binary.test
type_bit.test
type_bit_innodb.test
type_blob.test
type_date.test
type_datetime.test
type_decimal.test
type_enum.test
type_float.test
type_nchar.test
type_newdecimal-big.test
type_newdecimal.test
type_ranges.test
type_set.test
type_time.test
type_timestamp.test
type_uint.test
type_varchar.test
type_year.test
udf-master.opt
udf.test
udf_skip_grants-master.opt
udf_skip_grants.test
union-master.opt
union.test
unsafe_binlog_innodb-master.opt
unsafe_binlog_innodb.test
update.test
upgrade.test
user_limits.test
user_var-binlog.test
user_var.test
varbinary.test
variables-big.test
variables-notembedded-master.opt
variables-notembedded.test
variables.test
variables_community.test
variables_debug.test
view.test
view_alias.test
view_grant.test
wait_timeout.test
warnings-master.opt
warnings.test
warnings_engine_disabled-master.opt
warnings_engine_disabled.test
windows.test
xa.test
xml.test