summaryrefslogtreecommitdiff
path: root/storage/perfschema/ha_perfschema.cc
Commit message (Expand)AuthorAgeFilesLines
* Cleanup my_atomic.h includesSergey Vojtovich2020-03-211-1/+0
* Merge branch '10.3' into 10.4Oleksandr Byelkin2020-01-211-3/+10
|\
| * Merge branch '10.2' into 10.3Oleksandr Byelkin2020-01-211-3/+10
| |\
| | * Merge branch '10.1' into 10.2Oleksandr Byelkin2020-01-201-3/+10
| | |\
| | | * Merge branch 'merge-perfschema-5.6' into 10.1Oleksandr Byelkin2020-01-191-3/+10
| | | |\
| | | | * 5.6.47Oleksandr Byelkin2020-01-191-3/+10
* | | | | MDEV-19955 make argument of handler::ha_write_row() constEugene Kosov2019-07-051-1/+1
|/ / / /
* | | | Merge 10.2 into 10.3Marko Mäkelä2019-05-141-1/+1
|\ \ \ \ | |/ / /
| * | | Merge 10.1 into 10.2Marko Mäkelä2019-05-131-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
| | | * | 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.2' into 10.3Sergei Golubchik2018-05-111-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-05-101-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | 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 bb-10.2-ext into 10.3Marko Mäkelä2017-06-191-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-06-151-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-231-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 remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-04-191-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Added "const" to new data for handler::update_row()Michael Widenius2017-04-181-1/+1
| |/ / / / / /
* | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2016-12-301-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-12-291-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
| | | |\ \ \ \ | | | | |/ / /
* | | | | | | MDEV-11212 - Clean-up MariaDB atomic operationsSergey Vojtovich2016-12-131-11/+0
|/ / / / / /
* | | | | | Merge branch '10.2' into bb-10.2-janSergei Golubchik2016-09-191-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
| | |\ \ \ \ | | | |/ / /
* | | | | | misc after-merge changes:Sergei Golubchik2016-09-101-5/+0
|/ / / / /
* | | | | 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
|\ \ \