summaryrefslogtreecommitdiff
path: root/storage/perfschema/unittest
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.3' into 10.4Oleksandr Byelkin2019-05-1917-18/+22
|\
| * Merge 10.2 into 10.3Marko Mäkelä2019-05-1417-18/+18
| |\
| | * Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-112-2/+2
| | |\
| | | * Update FSF AddressVicențiu Ciorbaru2019-05-111-1/+1
| | * | Update FSF addressVicențiu Ciorbaru2019-05-115-5/+5
| | * | Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-1110-11/+11
| | |\ \ | | | |/
| | | * Follow-up to changing FSF addressVicențiu Ciorbaru2019-05-1110-10/+10
| * | | Merge branch '10.2' into 10.3Oleksandr Byelkin2019-05-122-0/+4
| |\ \ \ | | |/ /
| | * | MDEV-19399 do not call slow my_timer_init() several timesEugene Kosov2019-05-102-0/+4
* | | | MDEV-18400 - Move shutdown handling to main threadSergey Vojtovich2019-01-291-2/+0
|/ / /
* | | Merge 10.2 into 10.3Marko 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
* | | | | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ...Vladislav Vaintroub2018-02-061-2/+2
|/ / / /
* | | | Merge 10.0 into 10.1Marko Mäkelä2017-05-2011-37/+79
|\ \ \ \ | |/ / /
| * | | Revert "Fix unit test after merge from mysql 5.5.35 perfschema"Vicențiu Ciorbaru2017-05-171-1/+0
| * | | Merge branch 'merge-perfschema-5.6' into 10.0Vicențiu Ciorbaru2017-05-1611-36/+80
| |\ \ \ | | |/ /
| | * | 5.6.36Vicențiu Ciorbaru2017-05-1611-36/+80
* | | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-01-161-0/+1
|\ \ \ \ | |/ / /
| * | | Fix unit test after merge from mysql 5.5.35 perfschemaVicențiu Ciorbaru2017-01-101-0/+1
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-12-211-0/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'merge/merge-perfschema-5.6' into 10.0Sergei Golubchik2015-12-131-0/+1
| |\ \ \ | | |/ /
| | * | 5.6.28Sergei Golubchik2015-12-131-0/+1
* | | | 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-034-3/+114
|\ \ \ \ | |/ / /
| * | | Merge branch 'merge-perfschema-5.6' into 10.0Sergei Golubchik2015-08-034-3/+114
| |\ \ \ | | |/ /
| | * | 5.6.26Sergei Golubchik2015-08-034-2/+113
* | | | compilation failure on windowsSergei Golubchik2015-06-011-1/+1
* | | | Merge tag 'mariadb-10.0.19' into 10.1Sergei Golubchik2015-06-0110-23/+31
|\ \ \ \ | |/ / /
| * | | perfschema 5.6.24Sergei Golubchik2015-05-0510-23/+31
| |\ \ \ | | |/ /
| | * | 5.6.24Sergei Golubchik2015-05-0410-22/+29
* | | | MDEV-7437 remove suport for "atomics" with rwlocksSergei Golubchik2015-01-138-32/+0
* | | | GLOBAL_VALUE_ORIGIN=AUTOSergei Golubchik2014-10-111-0/+5
* | | | MD5 serviceSergei Golubchik2014-10-011-1/+1
|/ / /
* | | 5.5 mergeSergei Golubchik2014-05-091-1/+1
|\ \ \ | | |/ | |/|
| * | mysql-5.5.37 selective mergeSergei Golubchik2014-03-271-0/+1
| |\ \
| | * | Updated/added copyright header. Added line "use is subject to license terms" Murthy Narkedimilli2014-02-171-0/+1
* | | | perfschema 5.6.17Sergei Golubchik2014-05-075-7/+7
|\ \ \ \ | | |_|/ | |/| |
| * | | 5.6.17Sergei Golubchik2014-05-075-8/+8
| * | | perfschema 5.6.10 initial commit.Sergei Golubchik2014-05-0616-0/+4937
| / /
* | | MDEV-5620 CMake option to compile against an external PCRE librarySergei Golubchik2014-03-041-2/+1
* | | Merge 10.0-base -> 10.0Alexander Barkov2013-10-151-1/+2
|\ \ \
| * | | A follow-up for the previous commit:Alexander Barkov2013-10-021-0/+1
| * | | MDEV-4425 REGEXP enhancementsAlexander Barkov2013-09-261-1/+1
| |/ /
* | | 10.0-monty mergeSergei Golubchik2013-07-218-52/+428
|\ \ \
| * | | Applied all changes from Igor and SanjaMichael Widenius2013-06-151-26/+0
| * | | Temporary commit of 10.0-mergeMichael Widenius2013-03-268-52/+454
* | | | 10.0-base mergeSergei Golubchik2013-07-181-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | mysql-5.5.32 mergeSergei Golubchik2013-07-161-1/+1
| |\ \ \ | | | |/ | | |/|