summaryrefslogtreecommitdiff
path: root/storage/perfschema/pfs_global.cc
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | | | | | | | | | | | 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'
* | Merge branch 'merge-perfschema-5.6' into 10.0Sergei Golubchik2015-08-031-2/+36
|\ \ | | | | | | | | | 5.6.26
| * | 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 files
* | 10.0-base mergeSergei Golubchik2014-02-261-0/+4
|\ \ | |/
* | 10.0-monty mergeSergei Golubchik2013-07-211-11/+61
|\ \ | | | | | | | | | | | | | | | | | | | | | includes: * remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING" * introduce LOCK_share, now LOCK_ha_data is strictly for engines * rea_create_table() always creates .par file (even in "frm-only" mode) * fix a 5.6 bug, temp file leak on dummy ALTER TABLE
| * | Temporary commit of 10.0-mergeMichael Widenius2013-03-261-11/+61
| | |
* | | 10.0-base mergeSergei Golubchik2013-06-061-2/+2
|\ \ \ | |/ / |/| / | |/ (without InnoDB - all InnoDB changes were ignored)
| * Bug#16414644 ASSERTION FAILED: SIZE == PFS_ALLOCATED_MEMORYMarc Alff2013-02-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this fix, the command SHOW ENGINE PERFORMANCE_SCHEMA STATUS could report wrong amount of memory allocated, when the amount of memory used exceeds 4GB. The problem is that size computations are not done using size_t, so that overflows do occur, truncating the results. This fix compute memory sizes properly with size_t. Tested manually. No test script provided, as the script would need to allocate too much memory for the test.
* | 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 ↵Marc Alff2010-07-151-4/+7
| | | | | | | really used Backporting the fix from myql-next-mr (5.6) to mysql-trunk (5.5)
* WL#2360 Performance schemaMarc Alff2010-01-111-0/+66
Part V: performance schema implementation