summaryrefslogtreecommitdiff
path: root/storage/perfschema
Commit message (Expand)AuthorAgeFilesLines
* Merge bb-10.2-ext into 10.3Marko Mäkelä2017-11-103-4/+6
|\
| * Add more execution stages (commit, rollback, etc)Monty2017-11-053-4/+6
* | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-10-301-2/+4
|\ \ | |/
| * Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-301-2/+4
| |\
| | * 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
* | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-10-0410-13/+13
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-0210-13/+13
| |\ \ \ \ \ | | |/ / / /
| | * | | | MDEV-13384 - misc Windows warnings fixedVladislav Vaintroub2017-09-2810-13/+13
* | | | | | Changed KEY names to use LEX_CSTRINGMichael Widenius2017-08-241-4/+4
* | | | | | Enusure that my_global.h is included firstMichael Widenius2017-08-248-3/+6
* | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-06-1914-41/+85
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-06-1514-41/+85
| |\ \ \ \ \ | | |/ / / /
| | * | | | 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
* | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-05-051-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-12695 Add Column_definition::type_handler()Alexander Barkov2017-05-051-1/+1
* | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-04-246-31/+32
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Changing field::field_name and Item::name to LEX_CSTRINGMonty2017-04-236-31/+32
* | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-04-1916-18/+18
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Added "const" to new data for handler::update_row()Michael Widenius2017-04-1816-18/+18
| |/ / / /
* | | | | 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
|/ / / /