Jon Olav Hauglid 936bec8e2c 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

..

binlog

merge from 5.5-mtr

2010-11-09 13:04:44 +01:00

bugs

BUG#57108: mysqld crashes when I attempt to install plugin

2010-11-04 11:00:59 +01:00

engines

Manual merge

2010-05-26 22:34:25 +08:00

federated

WL#1054: Pluggable authentication support

2010-08-09 11:32:50 +03:00

funcs_1

Bug #57916: Fix the naming of the proxy_priv table

2010-11-02 17:45:26 +02:00

funcs_2

Bug#53563 Fix and enable charset/collation tests in funcs_2

2010-08-19 09:31:24 +02:00

innodb

Fixed bug#56619 - Assertion failed during

2010-11-10 14:32:42 +06:00

jp

…

large_tests

…

manual

Bug #49741 test files contain explicit references to bin/relay-log positions

2010-05-24 21:54:08 +08:00

ndb

merged

2010-10-05 11:47:03 +03:00

ndb_team

Manual merge

2010-05-26 22:34:25 +08:00

parts

Merge mysql-5.5-innodb -> mysql-5.5-bugteam

2010-10-11 12:55:23 +03:00

perfschema

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

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

perfschema_stress

…

rpl

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

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

rpl_ndb

Post-fix push for BUG#53452.

2010-08-25 15:13:20 +01:00

stress

…

sys_vars

due to merge.

2010-11-08 16:35:46 +01:00