summaryrefslogtreecommitdiff
path: root/storage/perfschema
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-03-241-3/+3
|\
| * Fix several compile warnings on WindowsVladislav Vaintroub2017-03-101-3/+3
* | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-03-091-4/+5
|\ \ | |/
| * Fix many -Wconversion warnings.Marko Mäkelä2017-03-071-4/+5
* | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-02-276-64/+130
|\ \ | |/
| * Merge branch '10.1' into 10.2Sergei Golubchik2017-02-106-64/+130
| |\
| | * 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 remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2016-12-301-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-12-291-1/+1
| |\ \ \ \ | | |/ / /
| | * | | 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
| | | |\ \ | | | | |/
* | | | | MDEV-11212 - Clean-up MariaDB atomic operationsSergey Vojtovich2016-12-131-11/+0
|/ / / /
* | | | MDEV-9114: Bulk operations (Array binding)Oleksandr Byelkin2016-11-021-0/+2
* | | | MDEV-7769 MY_CHARSET_INFO refactoring# On branch 10.2Alexander Barkov2016-10-101-6/+3
* | | | Merge branch '10.2' into bb-10.2-janSergei Golubchik2016-09-192-6/+12
|\ \ \ \
| * \ \ \ Merge branch '10.1' into 10.2Sergei Golubchik2016-09-092-6/+12
| |\ \ \ \ | | |/ / /
| | * | | 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
* | | | | misc after-merge changes:Sergei Golubchik2016-09-101-5/+0
|/ / / /
* | | | MDEV-9857 - CACHE_LINE_SIZE in innodb should be 128 on POWERSergey Vojtovich2016-06-071-1/+1
* | | | MDEV-9058: protocol: COM_MULTI command (part 1)Oleksandr Byelkin2016-03-181-1/+3
|/ / /
* | | 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