9 commits

Author	SHA1	Message	Date
Michael Widenius	5f1f2fc0e4	Applied all changes from Igor and Sanja	2013-06-15 18:32:08 +03:00
Michael Widenius	068c61978e	Temporary commit of 10.0-merge	2013-03-26 00:03:13 +02:00
Michael Widenius	1d0f70c2f8	Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6	2012-08-01 17:27:34 +03:00
Sergei Golubchik	0e007344ea	mysql-5.5.18 merge	2011-11-03 19:17:05 +01:00
Sergei Golubchik	2853f6bfbb	unit test fixes for ctest	2011-07-16 09:09:01 +02:00
Kent Boortz	02e07e3b51	Updated/added copyright headers	2011-06-30 17:46:53 +02:00
Marc Alff	4b1f459ae0	Fixed Copyright headers in storage/perfschema ... Fixed minor merge issues with #includes	2010-07-15 17:44:45 -06:00
Vladislav Vaintroub	cd45a44180	Post-merge fixes , define HAVE_RWLOCK_T on Solaris define ... DISABLE_MYSQL_THREAD_H for strings Also, enable unittests for perfschema	2010-01-14 18:42:28 +00:00
Marc Alff	e0e0f9e3d4	WL#2360 Performance schema ... Part V: performance schema implementation	2010-01-11 18:47:27 -07:00