summaryrefslogtreecommitdiff
path: root/storage/perfschema
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2018-11-061-1/+4
|\
| * Merge branch '10.0' into 10.1Sergei Golubchik2018-10-301-1/+4
| |\
| | * Merge branch 'merge/merge-perfschema-5.6' into 10.0Sergei Golubchik2018-10-281-1/+4
| | |\
| | | * 5.6.42Sergei Golubchik2018-10-271-1/+4
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-05-101-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2018-05-051-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch 'merge-perfschema-5.6' into 10.0Sergei Golubchik2018-04-261-1/+1
| | |\ \ | | | |/
* | | | Remove most 'register' use in C++Marko Mäkelä2018-04-242-21/+21
* | | | Compilation speed (#546)Eugene Kosov2018-01-142-4/+3
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-10-271-2/+4
|\ \ \ \ | |/ / /
| * | | Merge 10.0 into 10.1Marko Mäkelä2017-10-261-2/+4
| |\ \ \ | | |/ /
| | * | Merge branch 'merge-perfschema-5.6' into 10.0Vicențiu Ciorbaru2017-10-261-2/+4
| | |\ \ | | | |/
| | | * 5.6.38Vicențiu Ciorbaru2017-10-251-2/+4
* | | | MDEV-13384 - misc Windows warnings fixedVladislav Vaintroub2017-09-2810-13/+13
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-2314-41/+85
|\ \ \ \ | |/ / /
| * | | 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
* | | | Fix several compile warnings on WindowsVladislav Vaintroub2017-03-101-3/+3
* | | | Fix many -Wconversion warnings.Marko Mäkelä2017-03-071-4/+5
* | | | 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 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-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