summaryrefslogtreecommitdiff
path: root/storage/perfschema/pfs_global.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.2 into 10.3Marko Mäkelä2019-05-141-1/+1
|\
| * Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-111-1/+1
| |\
| | * Follow-up to changing FSF addressVicențiu Ciorbaru2019-05-111-1/+1
* | | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ...Vladislav Vaintroub2018-02-061-1/+1
* | | Enusure that my_global.h is included firstMichael Widenius2017-08-241-0/+1
|/ /
* | Merge branch 'merge-perfschema-5.6' into 10.0Sergei Golubchik2015-08-031-2/+36
|\ \
| * | 5.6.26Sergei Golubchik2015-08-031-2/+36
| * | 5.6.17Sergei Golubchik2014-05-071-2/+2
| * | perfschema 5.6.10 initial commit.Sergei Golubchik2014-05-061-0/+186
| /
* | 10.0-base mergeSergei Golubchik2014-02-261-0/+4
|\ \ | |/
* | 10.0-monty mergeSergei Golubchik2013-07-211-11/+61
|\ \
| * | Temporary commit of 10.0-mergeMichael Widenius2013-03-261-11/+61
* | | 10.0-base mergeSergei Golubchik2013-06-061-2/+2
|\ \ \ | |/ / |/| / | |/
| * Bug#16414644 ASSERTION FAILED: SIZE == PFS_ALLOCATED_MEMORYMarc Alff2013-02-281-2/+2
* | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6Michael Widenius2012-08-011-0/+66
|/
* Bug#53566 SHOW ENGINE PERFORMANCE_SCHEMA STATUS reports less memory than real...Marc Alff2010-07-151-4/+7
* WL#2360 Performance schemaMarc Alff2010-01-111-0/+66