Jon Olav Hauglid f11b9a88eb Merge from mysql-5.5-bugteam to mysql-5.5-runtime ...

Text conflict in mysql-test/suite/perfschema/r/dml_setup_instruments.result
Text conflict in mysql-test/suite/perfschema/r/global_read_lock.result
Text conflict in mysql-test/suite/perfschema/r/server_init.result
Text conflict in mysql-test/suite/perfschema/t/global_read_lock.test
Text conflict in mysql-test/suite/perfschema/t/server_init.test

2010-11-12 12:23:17 +01:00

..

aggregate.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

bad_option_1.result

WL#2360 Performance schema

2010-01-11 18:47:27 -07:00

bad_option_2.result

WL#2360 Performance schema

2010-01-11 18:47:27 -07:00

bad_option_3.result

Bug#55873 short startup options do not work in 5.5

2010-08-25 18:59:28 -06:00

bad_option_4.result

Bug#55873 short startup options do not work in 5.5

2010-08-25 18:59:28 -06:00

bad_option_5.result

Bug#55873 short startup options do not work in 5.5

2010-08-25 18:59:28 -06:00

binlog_mix.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

binlog_row.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

binlog_stmt.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

checksum.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

cnf_option.result

WL#2360 Performance schema

2010-01-11 18:47:27 -07:00

column_privilege.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

ddl_cond_instances.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

ddl_events_waits_current.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

ddl_events_waits_history_long.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

ddl_events_waits_history.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

ddl_ews_by_instance.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

ddl_ews_by_thread_by_event_name.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

ddl_ews_global_by_event_name.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

ddl_file_instances.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

ddl_fs_by_event_name.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

ddl_fs_by_instance.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

ddl_mutex_instances.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

ddl_performance_timers.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

ddl_rwlock_instances.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

ddl_setup_consumers.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

ddl_setup_instruments.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

ddl_setup_timers.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

ddl_threads.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

dml_cond_instances.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

dml_events_waits_current.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

dml_events_waits_history_long.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

dml_events_waits_history.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

dml_ews_by_instance.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

dml_ews_by_thread_by_event_name.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

dml_ews_global_by_event_name.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

dml_file_instances.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

dml_file_summary_by_event_name.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

dml_file_summary_by_instance.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

dml_mutex_instances.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

dml_performance_timers.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

dml_rwlock_instances.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

dml_setup_consumers.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

dml_setup_instruments.result

Merge from mysql-5.5-bugteam to mysql-5.5-runtime

2010-11-12 12:23:17 +01:00

dml_setup_timers.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

dml_threads.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

func_file_io.result

Merge from mysql-5.5-bugteam to mysql-5.5-runtime

2010-11-12 12:23:17 +01:00

func_mutex.result

Merge from mysql-5.5-bugteam to mysql-5.5-runtime

2010-11-12 12:23:17 +01:00

global_read_lock.result

Merge from mysql-5.5-bugteam to mysql-5.5-runtime

2010-11-12 12:23:17 +01:00

information_schema.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

misc.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

myisam_file_io.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

no_threads.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

one_thread_per_con.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

pfs_upgrade.result

Adjusted test result to lowercase table names

2010-11-08 17:55:38 +01:00

privilege.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

query_cache.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

read_only.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

schema.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

selects.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

server_init.result

Merge from mysql-5.5-bugteam to mysql-5.5-runtime

2010-11-12 12:23:17 +01:00

short_option_1.result

Bug#55873 short startup options do not work in 5.5

2010-08-25 18:59:28 -06:00

short_option_2.result

Bug#55873 short startup options do not work in 5.5

2010-08-25 18:59:28 -06:00

start_server_no_cond_class.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

start_server_no_cond_inst.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

start_server_no_file_class.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

start_server_no_file_inst.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

start_server_no_mutex_class.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

start_server_no_mutex_inst.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

start_server_no_rwlock_class.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

start_server_no_rwlock_inst.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

start_server_no_thread_class.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

start_server_no_thread_inst.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

start_server_off.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

start_server_on.result

Bug#57609 performance_schema does not work with lower_case_table_names

2010-11-03 16:42:33 +01:00

tampered_perfschema_table1.result

Merge mysql-5.5-bugteam --> local bugfixing branch

2010-11-08 18:14:30 +01:00

thread_cache.result

Bug#54782 Performance schema per thread accounting and thread cache

2010-07-16 07:50:50 -06:00