Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-11-06 | 1 | -1/+4 |
|\ | |||||
| * | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-10-30 | 1 | -1/+4 |
| |\ | |||||
| | * | Merge branch 'merge/merge-perfschema-5.6' into 10.0 | Sergei Golubchik | 2018-10-28 | 1 | -1/+4 |
| | |\ | |||||
| | | * | 5.6.42 | Sergei Golubchik | 2018-10-27 | 1 | -1/+4 |
* | | | | 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 |
| | |\ \ | | | |/ | |||||
* | | | | Remove most 'register' use in C++ | Marko Mäkelä | 2018-04-24 | 2 | -21/+21 |
* | | | | Compilation speed (#546) | Eugene Kosov | 2018-01-14 | 2 | -4/+3 |
* | | | | 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 |
* | | | | MDEV-13384 - misc Windows warnings fixed | Vladislav Vaintroub | 2017-09-28 | 10 | -13/+13 |
* | | | | 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 |
* | | | | Fix several compile warnings on Windows | Vladislav Vaintroub | 2017-03-10 | 1 | -3/+3 |
* | | | | Fix many -Wconversion warnings. | Marko Mäkelä | 2017-03-07 | 1 | -4/+5 |
* | | | | 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 branch '10.1' into 10.2 | Sergei Golubchik | 2016-12-29 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-09-28 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'merge/merge-perfschema-5.6' into 10.0 | Sergei Golubchik | 2016-09-27 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
* | | | | MDEV-9114: Bulk operations (Array binding) | Oleksandr Byelkin | 2016-11-02 | 1 | -0/+2 |
* | | | | MDEV-7769 MY_CHARSET_INFO refactoring# On branch 10.2 | Alexander Barkov | 2016-10-10 | 1 | -6/+3 |
* | | | | Merge branch '10.2' into bb-10.2-jan | Sergei Golubchik | 2016-09-19 | 2 | -6/+12 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-09-09 | 2 | -6/+12 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 2 | -6/+12 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch 'merge/merge-perfschema-5.6' into 10.0 | Sergei Golubchik | 2016-08-10 | 2 | -6/+12 |
| | | |\ \ | | | | |/ | |||||
| | | | * | 5.6.32 | Sergei Golubchik | 2016-08-10 | 1 | -5/+11 |
* | | | | | misc after-merge changes: | Sergei Golubchik | 2016-09-10 | 1 | -5/+0 |
|/ / / / | |||||
* | | | | MDEV-9857 - CACHE_LINE_SIZE in innodb should be 128 on POWER | Sergey Vojtovich | 2016-06-07 | 1 | -1/+1 |
* | | | | MDEV-9058: protocol: COM_MULTI command (part 1) | Oleksandr Byelkin | 2016-03-18 | 1 | -1/+3 |
|/ / / | |||||
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-02-23 | 2 | -3/+4 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'merge-perfschema-5.6' into 10.0 | Sergei Golubchik | 2016-02-16 | 2 | -3/+4 |
| |\ \ | | |/ | |||||
| | * | 5.6.29 | Sergei Golubchik | 2016-02-16 | 1 | -2/+3 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 6 | -9/+46 |
|\ \ \ | |/ / | |||||
| * | | after-merge: 10.0 part of MDEV-9249 (ERR_remove_state) | Sergei Golubchik | 2015-12-21 | 1 | -1/+1 |
| * | | Merge branch 'merge/merge-perfschema-5.6' into 10.0 | Sergei Golubchik | 2015-12-13 | 5 | -8/+45 |
| |\ \ | | |/ | |||||
| | * | 5.6.28 | Sergei Golubchik | 2015-12-13 | 5 | -8/+45 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-10-12 | 3 | -3/+40 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'merge-perfschema-5.6' into 10.0 | Sergei Golubchik | 2015-10-09 | 3 | -3/+40 |
| |\ \ | | |/ | |||||
| | * | 5.6.27 | Sergei Golubchik | 2015-10-09 | 2 | -2/+39 |