summaryrefslogtreecommitdiff
path: root/storage/perfschema
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'merge-perfschema-5.6' into 10.0Vicențiu Ciorbaru2017-10-261-2/+4
|\
| * 5.6.38Vicențiu Ciorbaru2017-10-251-2/+4
* | Revert "Fix unit test after merge from mysql 5.5.35 perfschema"Vicențiu Ciorbaru2017-05-171-1/+0
* | Update perfschema version to 5.6.36 post-mergeVicențiu Ciorbaru2017-05-161-1/+1
* | Merge branch 'merge-perfschema-5.6' into 10.0Vicențiu Ciorbaru2017-05-1613-39/+85
|\ \ | |/
| * 5.6.36Vicențiu Ciorbaru2017-05-1613-39/+85
* | Fix unit test after merge from mysql 5.5.35 perfschemaVicențiu Ciorbaru2017-01-101-0/+1
* | Merge remote-tracking branch 'merge/merge-perfschema-5.6' into 10.0Vicențiu Ciorbaru2017-01-105-64/+129
|\ \ | |/
| * 5.6.35Vicențiu Ciorbaru2017-01-075-64/+129
* | Merge branch 'merge/merge-perfschema-5.6' into 10.0Sergei Golubchik2016-09-271-1/+1
|\ \ | |/
* | Merge branch 'merge/merge-perfschema-5.6' into 10.0Sergei Golubchik2016-08-102-6/+12
|\ \ | |/
| * 5.6.32Sergei Golubchik2016-08-101-5/+11
* | Merge branch 'merge-perfschema-5.6' into 10.0Sergei Golubchik2016-02-162-3/+4
|\ \ | |/
| * 5.6.29Sergei Golubchik2016-02-161-2/+3
* | after-merge: 10.0 part of MDEV-9249 (ERR_remove_state)Sergei Golubchik2015-12-211-1/+1
* | Merge branch 'merge/merge-perfschema-5.6' into 10.0Sergei Golubchik2015-12-135-8/+45
|\ \ | |/
| * 5.6.28Sergei Golubchik2015-12-135-8/+45
* | Merge branch 'merge-perfschema-5.6' into 10.0Sergei Golubchik2015-10-093-3/+40
|\ \ | |/
| * 5.6.27Sergei Golubchik2015-10-092-2/+39
* | Merge branch 'merge-perfschema-5.6' into 10.0Sergei Golubchik2015-08-0327-103/+293
|\ \ | |/
| * 5.6.26Sergei Golubchik2015-08-0326-102/+292
* | Merge branch 'merge-perfschema-5.6' into 10.0Sergei Golubchik2015-06-161-1/+1
|\ \ | |/
* | perfschema 5.6.24Sergei Golubchik2015-05-0529-751/+337
|\ \ | |/
| * 5.6.24Sergei Golubchik2015-05-0429-757/+338
* | P_S 5.6.22Sergei Golubchik2015-01-212-9/+146
|\ \ | |/
| * 5.6.22Sergei Golubchik2015-01-192-9/+146
* | MDEV-6579: Properly handle gen_pfs_lex_token when cross-compilingJames Le Cuirot2014-08-151-3/+5
* | perfschema 5.6.20Sergei Golubchik2014-08-062-2/+2
|\ \ | |/
| * mysql-5.6.20Sergei Golubchik2014-08-061-1/+1
* | MDEV-6249 mark P_S STABLE and disable it by defaultSergei Golubchik2014-06-091-1/+1
* | MDEV-6258 MariaDB 10.0 performance schema timestamps relative to epochSergei Golubchik2014-06-051-1/+1
* | MDEV-6153 Trivial Lintian errors in MariaDB sources: spelling errors and wron...Sergei Golubchik2014-05-131-1/+1
* | 5.5 mergeSergei Golubchik2014-05-091-1/+1
|\ \
| * \ mysql-5.5.37 selective mergeSergei Golubchik2014-03-273-2/+5
| |\ \
| | * | Updated/added copyright header. Added line "use is subject to license terms" Murthy Narkedimilli2014-02-171-0/+1
| | * | Bug#16814264: FILTER OUT THE PERFORMANCE_SCHEMA RELAY LOG EVENTS FROM RELAY LOGRitheesh Vedire2014-01-312-2/+43
* | | | perfschema 5.6.17Sergei Golubchik2014-05-0774-430/+959
|\ \ \ \ | | |_|/ | |/| |
| * | | 5.6.17Sergei Golubchik2014-05-0777-442/+972
| * | | perfschema 5.6.10 initial commit.Sergei Golubchik2014-05-06172-0/+50229
| / /
* | | making perfschema easier to merge: remove unnecessary changesSergei Golubchik2014-05-063-98/+54
* | | MDEV-5620 CMake option to compile against an external PCRE librarySergei Golubchik2014-03-042-4/+2
* | | mergeSergei Golubchik2014-02-283-2/+7
|\ \ \
| * \ \ 10.0-base mergeSergei Golubchik2014-02-263-2/+7
| |\ \ \
| | * \ \ 5.5 mergeSergei Golubchik2014-02-252-2/+3
| | |\ \ \ | | | |/ /
| | | * | MySQL-5.5.36 mergeSergei Golubchik2014-02-172-2/+3
| | | |\ \ | | | | |/
| | | | * Updated/added copyright headersMurthy Narkedimilli2014-01-061-1/+1
| | | | * Bug#17928281 'CHECK_PERFORMANCE_SCHEMA()' LEAVES 'CURRENT_THD' REFERRINGMarc Alff2013-12-111-1/+2
* | | | | Fixing AIX compilation failiresAlexander Barkov2014-02-271-5/+9
|/ / / /
* | | | Merge 10.0-base -> 10.0Alexander Barkov2013-10-152-2/+4
|\ \ \ \ | |/ / /
| * | | A follow-up for the previous commit:Alexander Barkov2013-10-022-0/+2
View Lorry Controller Status