Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2018-05-11 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-05-10 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-05-05 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Merge branch 'merge-perfschema-5.6' into 10.0 | Sergei Golubchik | 2018-04-26 | 1 | -1/+1 |
| | | |\ | |||||
* | | | | | Optimize performance schema likely/unlikely | Michael Widenius | 2018-05-07 | 2 | -30/+23 |
* | | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-04-24 | 2 | -21/+21 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Remove most 'register' use in C++ | Marko Mäkelä | 2018-04-24 | 2 | -21/+21 |
* | | | | | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ... | Vladislav Vaintroub | 2018-02-06 | 15 | -31/+31 |
* | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2018-01-15 | 2 | -4/+3 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge 10.2 into bb-10.2-ext | Marko Mäkelä | 2018-01-15 | 2 | -4/+3 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Compilation speed (#546) | Eugene Kosov | 2018-01-14 | 2 | -4/+3 |
* | | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-11-10 | 3 | -4/+6 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Add more execution stages (commit, rollback, etc) | Monty | 2017-11-05 | 3 | -4/+6 |
* | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-10-30 | 1 | -2/+4 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-10-30 | 1 | -2/+4 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-10-27 | 1 | -2/+4 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-10-26 | 1 | -2/+4 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Merge branch 'merge-perfschema-5.6' into 10.0 | Vicențiu Ciorbaru | 2017-10-26 | 1 | -2/+4 |
| | | | |\ \ | | | | | |/ | |||||
| | | | | * | 5.6.38 | Vicențiu Ciorbaru | 2017-10-25 | 1 | -2/+4 |
* | | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-10-04 | 10 | -13/+13 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-10-02 | 10 | -13/+13 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | MDEV-13384 - misc Windows warnings fixed | Vladislav Vaintroub | 2017-09-28 | 10 | -13/+13 |
* | | | | | | Changed KEY names to use LEX_CSTRING | Michael Widenius | 2017-08-24 | 1 | -4/+4 |
* | | | | | | Enusure that my_global.h is included first | Michael Widenius | 2017-08-24 | 8 | -3/+6 |
* | | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-06-19 | 14 | -41/+85 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-06-15 | 14 | -41/+85 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-23 | 14 | -41/+85 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-20 | 14 | -41/+85 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Revert "Fix unit test after merge from mysql 5.5.35 perfschema" | Vicențiu Ciorbaru | 2017-05-17 | 1 | -1/+0 |
| | | | * | | Update perfschema version to 5.6.36 post-merge | Vicențiu Ciorbaru | 2017-05-16 | 1 | -1/+1 |
| | | | * | | Merge branch 'merge-perfschema-5.6' into 10.0 | Vicențiu Ciorbaru | 2017-05-16 | 13 | -39/+85 |
| | | | |\ \ | | | | | |/ | |||||
| | | | | * | 5.6.36 | Vicențiu Ciorbaru | 2017-05-16 | 13 | -39/+85 |
* | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-05-05 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | MDEV-12695 Add Column_definition::type_handler() | Alexander Barkov | 2017-05-05 | 1 | -1/+1 |
* | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-04-24 | 6 | -31/+32 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Changing field::field_name and Item::name to LEX_CSTRING | Monty | 2017-04-23 | 6 | -31/+32 |
* | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-04-19 | 16 | -18/+18 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Added "const" to new data for handler::update_row() | Michael Widenius | 2017-04-18 | 16 | -18/+18 |
| |/ / / / | |||||
* | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-03-24 | 1 | -3/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fix several compile warnings on Windows | Vladislav Vaintroub | 2017-03-10 | 1 | -3/+3 |
* | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-03-09 | 1 | -4/+5 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fix many -Wconversion warnings. | Marko Mäkelä | 2017-03-07 | 1 | -4/+5 |
* | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-02-27 | 6 | -64/+130 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-02-10 | 6 | -64/+130 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-01-16 | 6 | -64/+130 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Fix unit test after merge from mysql 5.5.35 perfschema | Vicențiu Ciorbaru | 2017-01-10 | 1 | -0/+1 |
| | | * | | Merge remote-tracking branch 'merge/merge-perfschema-5.6' into 10.0 | Vicențiu Ciorbaru | 2017-01-10 | 5 | -64/+129 |
| | | |\ \ | | | | |/ | |||||
| | | | * | 5.6.35 | Vicențiu Ciorbaru | 2017-01-07 | 5 | -64/+129 |
* | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2016-12-30 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-12-29 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / |