7 Commits

Author	SHA1	Message	Date
Nirbhay Choubey	91acc8b16f	Merge tag 'mariadb-10.0.21' into 10.0-galera	2015-08-08 14:21:22 -04:00
Sergei Golubchik	0a99293db3	Merge branch 'merge-perfschema-5.6' into 10.0 ... 5.6.26	2015-08-03 16:34:59 +02:00
Sergei Golubchik	167c540048	5.6.26	2015-08-03 13:05:40 +02:00
Nirbhay Choubey	9a57de86be	bzr merge -r4123..4144 codership/5.6	2014-09-30 18:06:15 -04:00
Nirbhay Choubey	7ed27e1b8e	Fix for some failing tests.	2014-06-26 12:11:12 -04:00
Sergei Golubchik	5ffe939a6c	perfschema 5.6.17	2014-05-07 16:12:16 +02:00
Sergei Golubchik	04bce7b569	5.6.17	2014-05-07 10:04:30 +02:00