4 Commits

Author	SHA1	Message	Date
Michael Widenius	60589aeee0	Next part of merge. See TODO for details	2012-08-14 17:23:34 +03:00
Sergei Golubchik	0accbd0364	lots of post-merge changes	2011-04-25 17:22:25 +02:00
Magne Mahre	7657ee10f8	Post-push fixups for WL#5349 ... mysql-test/suite/perfschema/t/no_threads-master.opt: Innodb will start multiple threads, which is not compatible with --one-thread. Disable innodb to be able to run the test case.	2010-06-22 12:13:47 +02:00
Marc Alff	e0e0f9e3d4	WL#2360 Performance schema ... Part V: performance schema implementation	2010-01-11 18:47:27 -07:00