Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-06-11 | 2 | -3/+3 |
|\ | |||||
| * | Only link mysys_ssl when required. | Vladislav Vaintroub | 2019-06-03 | 2 | -3/+3 |
* | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-05-14 | 33 | -33/+33 |
|\ \ | |/ | |||||
| * | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 33 | -33/+33 |
| |\ | |||||
| | * | 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 | 29 | -29/+29 |
| | * | | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
| | | * | Update FSF address | Michal Schorm | 2019-05-10 | 1 | -1/+1 |
* | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-05-03 | 2 | -1/+103 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-17702 fix unaligned access UB in sint4korr() and similar functions | Eugene Kosov | 2019-05-03 | 2 | -1/+103 |
* | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2019-03-29 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2019-03-29 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | cmake: re-enable -Werror in the maintainer mode | Sergei Golubchik | 2019-03-27 | 1 | -1/+1 |
* | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2019-03-17 | 1 | -1/+7 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2019-03-15 | 1 | -1/+7 |
| |\ \ \ | | |/ / | |||||
| | * | | fix gcc 8 compiler warnings | Sergei Golubchik | 2019-03-14 | 1 | -1/+7 |
* | | | | dirty merge | Oleksandr Byelkin | 2019-02-07 | 2 | -3/+71 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-02-03 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge 10.1 into 10.1 | Marko Mäkelä | 2019-02-02 | 1 | -2/+2 |
| | |\ \ | |||||
| | | * \ | Merge branch '5.5' into 10.0 | Oleksandr Byelkin | 2019-01-28 | 1 | -2/+2 |
| | | |\ \ | | | | |/ | |||||
| | | | * | MDEV-18269 - fix off-by-one bug in unittest | Natanael Copa | 2019-01-16 | 1 | -2/+2 |
| * | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-02-02 | 1 | -1/+69 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | MDEV-10963 Fragmented BINLOG query | Andrei Elkin | 2019-01-24 | 1 | -1/+69 |
* | | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2019-01-03 | 4 | -46/+11 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.1' into 10.2mariadb-10.2.21 | Sergei Golubchik | 2018-12-30 | 4 | -46/+11 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-12-29 | 4 | -46/+11 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2018-12-20 | 4 | -46/+11 |
| | | |\ \ | | | | |/ | |||||
| | | | * | MDEV-15670 - unit.my_atomic failed in buildbot with Signal 11 thrown | Sergey Vojtovich | 2018-12-18 | 4 | -46/+11 |
| | | * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2018-06-21 | 1 | -1/+1 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Revert "MDEV-16075: Workaround to run MTR test suite for make test" | Sergei Golubchik | 2018-06-20 | 1 | -1/+1 |
| | | * | | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2018-06-10 | 1 | -2/+1 |
| | | |\ \ | | | | |/ | |||||
| | | | * | MDEV-16075: Workaround to run MTR test suite for make test | Teodor Mircea Ionita | 2018-06-10 | 1 | -1/+1 |
* | | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-11-06 | 1 | -1/+87 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-11-06 | 1 | -1/+87 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | MDEV-17133 follow-up patch to fix mf_iocache-t unittest | Andrei Elkin | 2018-11-01 | 1 | -1/+1 |
| | * | | | MDEV-17133 dump thread reads from a past position | Andrei Elkin | 2018-10-21 | 1 | -1/+86 |
| | * | | | compiler warnings (clang 4.0.1 on i386) | Sergei Golubchik | 2018-09-04 | 1 | -2/+2 |
| | * | | | MDEV-14014 Multi-Slave Replication Fail: bogus data in log event | Andrei Elkin | 2018-06-28 | 1 | -1/+36 |
* | | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2018-06-30 | 1 | -1/+36 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | MDEV-14014 Multi-Slave Replication Fail: bogus data in log event | Andrei Elkin | 2018-06-28 | 1 | -1/+36 |
* | | | | | MDEV-16478: mysql_real_connect() from libmariadbd.so always crash | Oleksandr Byelkin | 2018-06-25 | 2 | -0/+98 |
* | | | | | After-merge fixes | Marko Mäkelä | 2018-05-30 | 1 | -12/+12 |
* | | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-05-29 | 1 | -1/+71 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fix conversion warnings/errors. | Vladislav Vaintroub | 2018-05-24 | 1 | -1/+1 |
| * | | | | Merge remote-tracking branch 'origin/10.1' into 10.2 | Monty | 2018-05-24 | 1 | -1/+71 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | MDEV-10259 mysqld crash with certain statement length and... | sachin | 2018-05-22 | 1 | -1/+71 |
* | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2018-02-15 | 1 | -0/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch 'github/10.1' into 10.2 | Sergei Golubchik | 2018-02-06 | 1 | -0/+3 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch 'github/10.0' into 10.1 | Sergei Golubchik | 2018-02-02 | 1 | -0/+3 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge remote-tracking branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2018-01-24 | 1 | -0/+3 |
| | | |\ \ | | | | |/ |