Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.2' into 10.3 | Oleksandr Byelkin | 2020-01-21 | 11 | -36/+112 |
|\ | |||||
| * | Merge branch '10.1' into 10.2 | Oleksandr Byelkin | 2020-01-20 | 11 | -36/+112 |
| |\ | |||||
| | * | Merge branch 'merge-perfschema-5.6' into 10.1 | Oleksandr Byelkin | 2020-01-19 | 11 | -36/+112 |
| | |\ | |||||
| | | * | 5.6.47 | Oleksandr Byelkin | 2020-01-19 | 11 | -36/+112 |
| | | * | 5.6.31 | Sergei Golubchik | 2016-06-21 | 3 | -22/+22 |
* | | | | Merge branch '10.2' into 10.3 | Oleksandr Byelkin | 2019-10-31 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-18562 [ERROR] InnoDB: WSREP: referenced FK check fail: Lock wait index | Jan Lindström | 2019-10-30 | 1 | -2/+2 |
* | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-05-14 | 44 | -44/+44 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 44 | -44/+44 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 31 | -31/+31 |
| | |\ \ | |||||
| | | * | | Update FSF Address | Vicențiu Ciorbaru | 2019-05-11 | 13 | -13/+13 |
| | * | | | Update FSF address | Vicențiu Ciorbaru | 2019-05-11 | 3 | -3/+3 |
| | * | | | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 8 | -8/+8 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Follow-up to changing FSF address | Vicențiu Ciorbaru | 2019-05-11 | 5 | -5/+5 |
| | | * | | Update FSF address | Michal Schorm | 2019-05-10 | 3 | -3/+3 |
* | | | | | Merge remote-tracking branch 'origin/10.2' into 10.3bb-10.3-janmerge | Jan Lindström | 2019-04-12 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fix wsrep_thd_is_applier macro to point correct function name. | Jan Lindström | 2019-04-10 | 1 | -1/+1 |
* | | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2019-03-29 | 1 | -12/+14 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2019-03-29 | 1 | -12/+14 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Revert MDEV-18464 and MDEV-12009 | Marko Mäkelä | 2019-03-28 | 1 | -3/+0 |
| | * | | | MDEV-12009: Allow to force kill user threads/query which are flagged as high ... | Jan Lindström | 2019-03-28 | 1 | -0/+3 |
| | * | | | cmake: re-enable -Werror in the maintainer mode | Sergei Golubchik | 2019-03-27 | 1 | -12/+14 |
| | * | | | MDEV-9519: Data corruption will happen on the Galera cluster size change | Julius Goryavsky | 2019-02-25 | 1 | -0/+3 |
* | | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-03-19 | 1 | -0/+6 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | MDEV-17262: mysql crashed on galera while node rejoined cluster (#895) | sysprg | 2019-03-18 | 1 | -0/+6 |
* | | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2019-03-17 | 1 | -1/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | MDEV-18577: Indexes problem on import dump SQL | Jan Lindström | 2019-03-13 | 1 | -1/+3 |
| * | | | | MDEV-9519: Data corruption will happen on the Galera cluster size change | Julius Goryavsky | 2019-02-26 | 1 | -0/+3 |
* | | | | | MDEV-9519: Data corruption will happen on the Galera cluster size change | Julius Goryavsky | 2019-02-26 | 1 | -0/+3 |
* | | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-11-06 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-11-06 | 1 | -2/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2018-11-05 | 1 | -2/+2 |
| | |\ \ \ | |||||
| | | * | | | Remove dead code is_thd_killed() | Marko Mäkelä | 2018-11-02 | 1 | -2/+2 |
| | * | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-10-30 | 1 | -0/+12 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | MDEV-12547: InnoDB FULLTEXT index has too strict innodb_ft_result_cache_limit... | Thirunarayanan Balathandayuthapani | 2018-10-16 | 1 | -0/+12 |
* | | | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-10-09 | 1 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | MDEV-17373 Windows: application verifier stop "Attempt to use an unknown SOCKET" | Vladislav Vaintroub | 2018-10-05 | 1 | -2/+2 |
* | | | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2018-09-28 | 1 | -0/+3 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch '10.1' into 10.2 | Oleksandr Byelkin | 2018-09-14 | 1 | -0/+3 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | fix failures of innodb_plugin tests in --embedded | Sergei Golubchik | 2018-09-04 | 1 | -0/+3 |
* | | | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2018-06-30 | 1 | -0/+6 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-06-21 | 1 | -0/+6 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch '10.0-galera' into 10.1 | Vicențiu Ciorbaru | 2018-06-12 | 1 | -0/+6 |
| | |\ \ \ \ | |||||
| | | * | | | | MDEV-8743: mysqld port/socket - FD_CLOEXEC if no SOCK_CLOEXEC | Daniel Black | 2018-04-19 | 1 | -0/+6 |
| | | * | | | | Merge tag 'mariadb-10.0.31' into 10.0-galera | Sachin Setiya | 2017-05-30 | 1 | -1/+0 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | * | | | | Merge branch '10.0' into bb-10.0-galera | Sachin Setiya | 2017-03-20 | 1 | -0/+44 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-merge | Sachin Setiya | 2017-03-17 | 2 | -40/+1 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-04-29 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ | |||||
* | | | | | | | | | | Optimize performance schema likely/unlikely | Michael Widenius | 2018-05-07 | 9 | -368/+453 |
* | | | | | | | | | | Misc. typos | luz.paz | 2018-04-05 | 2 | -2/+2 |