8 Commits

Author	SHA1	Message	Date
Vicențiu Ciorbaru	f177f125d4	Merge branch '5.5' into 10.1	2019-05-11 19:15:57 +03:00
Vicențiu Ciorbaru	15f1e03d46	Follow-up to changing FSF address ... Some places didn't match the previous rules, making the Floor address wrong. Additional sed rules: sed -i -e 's/Place.*Suite .*, Boston/Street, Fifth Floor, Boston/g' sed -i -e 's/Suite .*, Boston/Fifth Floor, Boston/g'	2019-05-11 18:30:45 +03:00
Sergei Golubchik	e695db0f2d	MDEV-7437 remove suport for "atomics" with rwlocks	2015-01-13 10:15:21 +01: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
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
Marc Alff	e0e0f9e3d4	WL#2360 Performance schema ... Part V: performance schema implementation	2010-01-11 18:47:27 -07:00