summaryrefslogtreecommitdiff
path: root/storage/perfschema/CMakeLists.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.5' into bb-10.6-releaseOleksandr Byelkin2022-08-031-1/+3
|\
| * Merge branch 'merge-perfschema-5.7' into 10.5Oleksandr Byelkin2022-08-021-1/+3
| |\
| | * mysql-5.7.39Oleksandr Byelkin2022-07-291-1/+3
* | | Merge branch '10.5' into 10.6Oleksandr Byelkin2022-02-031-1/+1
|\ \ \ | |/ /
| * | Merge branch 'merge-perfschema-5.7' into 10.5Oleksandr Byelkin2022-01-281-1/+1
| |\ \ | | |/
| | * 5.7.37Oleksandr Byelkin2022-01-251-2/+1
| | * 5.7.34Sergei Golubchik2021-05-031-1/+1
| | * 5.7.28Sergei Golubchik2019-12-111-5/+11
| | * 5.7.13Sergei Golubchik2016-07-281-3/+129
* | | Merge 10.5 to 10.6Marko Mäkelä2021-08-191-2/+1
|\ \ \ | |/ /
| * | Merge 10.4 into 10.5Marko Mäkelä2021-08-181-2/+1
| |\ \
| | * | cleanup: specifying plugin dependencies in CMakeLists.txtSergei Golubchik2021-08-031-2/+3
* | | | Merge 10.5 into 10.6Marko Mäkelä2021-06-011-0/+3
|\ \ \ \ | |/ / /
| * | | perfschema: use glibc gettid if availableDaniel Black2021-06-011-0/+3
* | | | Merge 10.5 into 10.6Marko Mäkelä2021-05-071-2/+1
|\ \ \ \ | |/ / /
| * | | Merge branch bb-10.4-release into bb-10.5-releasemariadb-10.5.10Nikita Malyavin2021-05-051-2/+1
| |\ \ \ | | |/ /
| | * | MDEV-25543: Building failure on MacOS in case MariadDB server is compiled wit...bb-10.2-MDEV-25543Dmitry Shulga2021-04-281-2/+1
* | | | MDEV-20220: Merge 5.7 P_S replication table 'replication_applier_status_by_wo...Sujatha2021-04-081-1/+1
|/ / /
* | | Add build on AIXEtienne Guesnet2020-12-161-0/+5
* | | MDEV-23091: perfschema Add support for OpenBSD's getthrid() to retrieve the t...Brad Smith2020-08-281-0/+10
* | | perfschema compilation, test and misc fixesSergei Golubchik2020-03-101-4/+55
* | | P_S 5.7.28Sergei Golubchik2020-03-101-0/+123
|/ /
* | Merge branch 'merge-perfschema-5.6' into 10.1Oleksandr Byelkin2020-01-191-4/+11
|\ \
| * | 5.6.47Oleksandr Byelkin2020-01-191-6/+12
| |/
* | 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
* | | Merge branch '10.0' into 10.1Sergei Golubchik2015-12-211-1/+1
|\ \ \
| * | | after-merge: 10.0 part of MDEV-9249 (ERR_remove_state)Sergei Golubchik2015-12-211-1/+1
* | | | fix cmake dependenciesSergei Golubchik2015-06-021-3/+6
* | | | Merge tag 'mariadb-10.0.19' into 10.1Sergei Golubchik2015-06-011-21/+1
|\ \ \ \ | |/ / /
| * | | perfschema 5.6.24Sergei Golubchik2015-05-051-21/+1
| |\ \ \ | | | |/ | | |/|
| | * | 5.6.24Sergei Golubchik2015-05-041-19/+1
| | * | perfschema 5.6.10 initial commit.Sergei Golubchik2014-05-061-0/+207
| | /
* | | MDEV-7437 remove suport for "atomics" with rwlocksSergei Golubchik2015-01-131-1/+0
* | | fix out-of-source buildsSergei Golubchik2014-12-041-0/+1
* | | Merge 10.0.14 into 10.1Sergei Golubchik2014-10-151-3/+5
|\ \ \ | |/ /
| * | MDEV-6579: Properly handle gen_pfs_lex_token when cross-compilingJames Le Cuirot2014-08-151-3/+5
* | | cleanup: galera merge, simple changesSergei Golubchik2014-10-011-4/+0
* | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-271-0/+4
|\ \ \
| * | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-261-0/+4
| |/ /
* | | MDEV-4262 - P_S discoverySergey Vojtovich2014-08-191-1/+0
|/ /
* | MDEV-5620 CMake option to compile against an external PCRE librarySergei Golubchik2014-03-041-2/+1
* | Merge 10.0-base -> 10.0Alexander Barkov2013-10-151-1/+2
|\ \
| * | A follow-up for the previous commit:Alexander Barkov2013-10-021-0/+1
| * | MDEV-4425 REGEXP enhancementsAlexander Barkov2013-09-261-1/+1
| |/
* | Temporary commit of 10.0-mergeMichael Widenius2013-03-261-0/+9
* | merge with 5.5Sergei Golubchik2012-11-031-1/+1
|\ \ | |/
| * MDEV-672 : storage/maria and storage/perfschema do not appear to honor WITH_U...Vladislav Vaintroub2012-10-301-1/+1
* | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6Michael Widenius2012-08-011-51/+169
|/
* unit test fixes for ctestSergei Golubchik2011-07-161-2/+1