summaryrefslogtreecommitdiff
path: root/storage/perfschema
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ / / /
* | | | Merge 10.0-base -> 10.0Alexander Barkov2013-10-152-2/+4
|\ \ \ \ | |/ / /
| * | | A follow-up for the previous commit:Alexander Barkov2013-10-022-0/+2
| * | | MDEV-4425 REGEXP enhancementsAlexander Barkov2013-09-262-2/+2
* | | | Client attributesunknown2013-10-031-0/+3
* | | | Fixed compiler warningsMichael Widenius2013-08-2134-34/+34
* | | | more post-merge fixes:Sergei Golubchik2013-07-211-1/+1
* | | | 10.0-monty mergeSergei Golubchik2013-07-2181-1096/+3277
|\ \ \ \
| * | | | MDEV-4058unknown2013-06-272-10/+1
| * | | | Fixed memory leaks. alias.test now runs clean with valgrindMichael Widenius2013-06-208-8/+8
| * | | | Fixed some memory leaksMichael Widenius2013-06-192-2/+2
| * | | | Applied all changes from Igor and SanjaMichael Widenius2013-06-153-28/+3
| * | | | Temporary commit of 10.0-mergeMichael Widenius2013-03-2681-1087/+3302
* | | | | 10.0-base mergeSergei Golubchik2013-07-181-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 5.5 mergeSergei Golubchik2013-07-171-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | mysql-5.5.32 mergeSergei Golubchik2013-07-161-1/+1
| | |\ \ \ | | | | |/ | | | |/|