summaryrefslogtreecommitdiff
path: root/storage/perfschema
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0' into 10.1Sergei Golubchik2015-10-123-3/+40
|\
| * Merge branch 'merge-perfschema-5.6' into 10.0Sergei Golubchik2015-10-093-3/+40
| |\
| | * 5.6.27Sergei Golubchik2015-10-092-2/+39
* | | MDEV-6066: Merge new defaults from 5.6 and 5.7 (autoset)Oleksandr Byelkin2015-09-041-1/+5
* | | Merge branch '10.0' into 10.1Sergei Golubchik2015-09-0327-103/+293
|\ \ \ | |/ /
| * | Merge branch 'merge-perfschema-5.6' into 10.0Sergei Golubchik2015-08-0327-103/+293
| |\ \ | | |/
| | * 5.6.26Sergei Golubchik2015-08-0326-102/+292
* | | 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
| |\ \ | | |/
* | | fix cmake dependenciesSergei Golubchik2015-06-021-3/+6
* | | compilation failure on windowsSergei Golubchik2015-06-011-1/+1
* | | Merge tag 'mariadb-10.0.19' into 10.1Sergei Golubchik2015-06-0129-750/+337
|\ \ \ | |/ /
| * | perfschema 5.6.24Sergei Golubchik2015-05-0529-751/+337
| |\ \ | | |/
| | * 5.6.24Sergei Golubchik2015-05-0429-757/+338
* | | Reducing duplicate code and simplifying well formed string copyingAlexander Barkov2015-02-271-7/+3
* | | Merge branch '10.0' into merge-wipSergei Golubchik2015-01-312-9/+146
|\ \ \ | |/ /
| * | P_S 5.6.22Sergei Golubchik2015-01-212-9/+146
| |\ \ | | |/
| | * 5.6.22Sergei Golubchik2015-01-192-9/+146
* | | MDEV-7437 remove suport for "atomics" with rwlocksSergei Golubchik2015-01-1312-243/+12
* | | fix out-of-source buildsSergei Golubchik2014-12-041-0/+1
* | | parser cleanup: don't store field properties in LEX, use Create_field directlySergei Golubchik2014-12-041-1/+2
* | | Merge 10.0.14 into 10.1Sergei Golubchik2014-10-153-5/+7
|\ \ \ | |/ /
| * | 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
* | | GLOBAL_VALUE_ORIGIN=AUTOSergei Golubchik2014-10-112-19/+44
* | | MD5 serviceSergei Golubchik2014-10-013-3/+3
* | | 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-1996-4586/+888
|/ /
* | 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
|/ / / /