Nirbhay Choubey 89b2bc42f4 Merge revisions from maria/5.5 ...

bzr merge -r4388 lp:maria/5.5

2014-12-16 20:07:34 -05:00

..

include

Buildbot fixes and cleanups:

2013-01-11 02:03:43 +02:00

r

Merge from maria/5.5 (-rtag:mariadb-5.5.36).

2014-02-25 17:49:41 -05:00

t

Fix test failure in perfschema.myisam_file_io when perfschema is not compiled into the server.

2014-10-20 09:36:41 +02:00

disabled.def

mysql-5.5.28

2012-10-16 13:04:42 +02:00