summaryrefslogtreecommitdiff
path: root/storage/perfschema
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.0 into 10.1Marko Mäkelä2017-05-2014-41/+85
|\
| * 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
* | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-01-166-64/+130
|\ \ \ | |/ /
| * | 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 '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
| |\ \ | | |/
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-08-252-6/+12
|\ \ \ | |/ /
| * | 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 '10.0' into 10.1Sergei Golubchik2016-02-232-3/+4
|\ \ \ | |/ /
| * | Merge branch 'merge-perfschema-5.6' into 10.0Sergei Golubchik2016-02-162-3/+4
| |\ \ | | |/
| | * 5.6.29Sergei Golubchik2016-02-161-2/+3
* | | Merge branch '10.0' into 10.1Sergei Golubchik2015-12-216-9/+46
|\ \ \ | |/ /
| * | 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 '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
|\ \ \
View Lorry Controller Status