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

..

include

Bug#57609 performance_schema does not work with lower_case_table_names

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

r

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

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

t

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

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