summaryrefslogtreecommitdiff
path: root/storage/perfschema/ha_perfschema.cc
Commit message (Expand)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
| * mysql-5.5.37 selective mergeSergei Golubchik2014-03-271-1/+1
| |\
| | * Bug#16814264: FILTER OUT THE PERFORMANCE_SCHEMA RELAY LOG EVENTS FROM RELAY LOGRitheesh Vedire2014-01-311-1/+7
* | | Merge branch '10.0' into 10.1Sergei Golubchik2018-05-051-1/+1
|\ \ \
| * \ \ Merge branch 'merge-perfschema-5.6' into 10.0Sergei Golubchik2018-04-261-1/+1
| |\ \ \
* | \ \ \ Merge 10.0 into 10.1Marko Mäkelä2017-05-201-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Update perfschema version to 5.6.36 post-mergeVicențiu Ciorbaru2017-05-161-1/+1
* | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-09-281-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'merge/merge-perfschema-5.6' into 10.0Sergei Golubchik2016-09-271-1/+1
| |\ \ \ \ | | |/ / /
* | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-08-251-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'merge/merge-perfschema-5.6' into 10.0Sergei Golubchik2016-08-101-1/+1
| |\ \ \ \ | | |/ / /
* | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-02-231-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'merge-perfschema-5.6' into 10.0Sergei Golubchik2016-02-161-1/+1
| |\ \ \ \ | | |/ / /
* | | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-10-121-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'merge-perfschema-5.6' into 10.0Sergei Golubchik2015-10-091-1/+1
| |\ \ \ \ | | |/ / /
* | | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-09-031-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'merge-perfschema-5.6' into 10.0Sergei Golubchik2015-08-031-1/+1
| |\ \ \ \ | | |/ / /
* | | | | Merge tag 'mariadb-10.0.20' into 10.1Sergei Golubchik2015-06-271-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'merge-perfschema-5.6' into 10.0Sergei Golubchik2015-06-161-1/+1
| |\ \ \ \ | | |/ / /
* | | | | Merge 10.0.14 into 10.1Sergei Golubchik2014-10-151-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | perfschema 5.6.20Sergei Golubchik2014-08-061-1/+1
| |\ \ \ \ | | |/ / /
* | | | | MDEV-4262 - P_S discoverySergey Vojtovich2014-08-191-15/+20
|/ / / /
* | | | MDEV-6249 mark P_S STABLE and disable it by defaultSergei Golubchik2014-06-091-1/+1
* | | | perfschema 5.6.17Sergei Golubchik2014-05-071-2/+16
|\ \ \ \ | |/ / /
| * | | 5.6.17Sergei Golubchik2014-05-071-2/+16
| * | | perfschema 5.6.10 initial commit.Sergei Golubchik2014-05-061-0/+470
| / /
* | | making perfschema easier to merge: remove unnecessary changesSergei Golubchik2014-05-061-0/+5
* | | 10.0-monty mergeSergei Golubchik2013-07-211-4/+16
|\ \ \
| * | | Temporary commit of 10.0-mergeMichael Widenius2013-03-261-4/+16
* | | | Fixing the problem with my_bool_t defined two times.Alexander Barkov2013-06-031-3/+1
* | | | 10.0-base mergeSergei Golubchik2013-04-151-9/+0
|\ \ \ \ | |/ / / |/| | |
| * | | * move bas_ext from the handler to the handlertonSergei Golubchik2013-04-071-9/+0
| |/ /
* | | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6Michael Widenius2012-08-011-12/+43
|/ /
* | mysql-5.5.22 mergeSergei Golubchik2012-03-281-1/+1
|\ \ | |/
| * Updated/added copyright headersMySQL Build Team2012-02-161-1/+1
* | mysql-5.5.18 mergeSergei Golubchik2011-11-031-1/+2
|\ \ | |/
| * Merging into mysql-5.5.16-release.Mats Kindahl2011-08-151-1/+2
* | post-merge fixes.Sergei Golubchik2011-07-021-5/+0
* | 5.5-mergeSergei Golubchik2011-07-021-4/+36
|\ \ | |/
| * Bug#53696 Performance schema engine violates the PSEA API by calling my_error()Marc Alff2010-12-011-4/+31
| * Bug#49938: Failing assertion: inode or deadlock in fsp/fsp0fsp.cDavi Arnaut2010-10-061-0/+5
| * Header files should be self-containedTor Didriksen2010-09-101-1/+1
| * Bug#56521 Assertion failed: (m_state == 2), function allocated_to_free, pfs_l...Marc Alff2010-09-091-0/+12
* | lots of post-merge changesSergei Golubchik2011-04-251-0/+18
* | Selective transfer of a bugfix patch into 5.5.6-rc.Joerg Bruehe2010-09-131-0/+12
|/
* Fixed Copyright headers in storage/perfschemaMarc Alff2010-07-151-7/+8
* WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-1/+2
* WL#2360 Performance schemaMarc Alff2010-01-111-0/+382