Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.2 into 10.3 | Marko Mäkelä | 2020-08-13 | 1 | -1/+2 |
|\ | |||||
| * | Fix GCC 10.2.0 -Og -Wmaybe-uninitialized | Marko Mäkelä | 2020-08-11 | 1 | -1/+2 |
* | | Merge 10.2 into 10.3 | Marko Mäkelä | 2020-03-20 | 1 | -3/+4 |
|\ \ | |/ | |||||
| * | MDEV-21981 Replace arithmetic + with bitwise OR when possible | Marko Mäkelä | 2020-03-19 | 1 | -3/+4 |
* | | Write error message if aria_log.??????? files are missing | Monty | 2019-10-20 | 1 | -0/+31 |
* | | Merge 10.2 into 10.3 | Eugene Kosov | 2019-07-16 | 1 | -5/+12 |
|\ \ | |/ | |||||
| * | Merge 10.1 into 10.2 | Eugene Kosov | 2019-07-09 | 1 | -5/+12 |
| |\ | |||||
| | * | Give a readable error if aria_log page numbers doesn't match | Michael Widenius | 2019-06-25 | 1 | -2/+9 |
| | * | Backport aria usage if LSN_FMT from 10.3 | Michael Widenius | 2019-06-25 | 1 | -159/+159 |
* | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-05-14 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | 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 branch '10.2' into 10.3 | Sergei Golubchik | 2018-06-30 | 1 | -35/+190 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-06-21 | 1 | -35/+190 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge remote-tracking branch 'origin/10.0' into 10.1 | Alexander Barkov | 2018-06-19 | 1 | -32/+187 |
| | |\ \ | |||||
| | | * \ | Merge remote-tracking branch 'origin/5.5' into 10.0 | Alexander Barkov | 2018-06-19 | 1 | -32/+187 |
| | | |\ \ | | | | |/ | |||||
| | | | * | MDEV-15113: Hang in Aria loghandler | Oleksandr Byelkin | 2018-06-12 | 1 | -32/+187 |
| | * | | | Merge branch '10.0-galera' into 10.1 | Vicențiu Ciorbaru | 2018-06-12 | 1 | -3/+3 |
| | |\ \ \ | |||||
| | | * \ \ | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-05-07 | 1 | -3/+3 |
| | | |\ \ \ | | | | |/ / | | | |/| | | |||||
| | | | * | | MDEV-8743: protect myisam/aria MYD files and aria log files | Daniel Black | 2018-03-02 | 1 | -3/+3 |
| | | | |/ | |||||
* | | | | | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ... | Vladislav Vaintroub | 2018-02-06 | 1 | -5/+6 |
* | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-12-14 | 1 | -1/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-12-14 | 1 | -1/+0 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-12-12 | 1 | -1/+0 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Fix a -Wimplicit-fallthrough warning | Marko Mäkelä | 2017-11-10 | 1 | -1/+0 |
* | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-10-30 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-10-24 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-10-22 | 1 | -1/+1 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-10-18 | 1 | -1/+1 |
| | | |\ \ | | | | |/ | |||||
| | | | * | MDEV-13595: mariadb-10.2.8/storage/maria/ma_loghandler.c:2730]: (style) Array... | Oleksandr Byelkin | 2017-10-05 | 1 | -1/+1 |
* | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-10-04 | 1 | -245/+245 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | MDEV-13384 - misc Windows warnings fixed | Vladislav Vaintroub | 2017-09-28 | 1 | -25/+25 |
| * | | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT. | Vladislav Vaintroub | 2017-09-28 | 1 | -223/+223 |
| |/ / / | |||||
* | | | | Added DBUG_ASSERT_AS_PRINTF compile flag | Monty | 2017-08-24 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-07-07 | 1 | -1/+3 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-07-06 | 1 | -1/+3 |
| |\ \ | | |/ | |||||
| | * | ma_loghandler: translog_set_only_in_buffers failed to release lock | Daniel Black | 2017-07-03 | 1 | -1/+2 |
| | * | ma_loghandler: release file_header_lock on error | Daniel Black | 2017-07-03 | 1 | -0/+1 |
* | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-23 | 1 | -19/+34 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into 10.0mariadb-10.0.31 | Sergei Golubchik | 2017-05-20 | 1 | -8/+17 |
| |\ \ | | |/ | |||||
| | * | Make IF clear. | Oleksandr Byelkin | 2017-05-18 | 1 | -8/+17 |
| * | | MDEV-6262 analyze the coverity report on mariadb | Sergei Golubchik | 2017-05-19 | 1 | -11/+17 |
* | | | Correct FSF address | iangilfillan | 2017-03-10 | 1 | -1/+1 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 1 | -6/+5 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into bb-10.0 | Sergei Golubchik | 2016-06-21 | 1 | -6/+5 |
| |\ \ | | |/ | |||||
| | * | MDEV-9994 - Aria service threads are not "joined" | Sergey Vojtovich | 2016-06-10 | 1 | -6/+5 |
* | | | Push for testing of encryption | Monty | 2015-02-10 | 1 | -42/+21 |
* | | | split an assert | Sergei Golubchik | 2015-01-15 | 1 | -2/+2 |
* | | | MDEV-7437 remove suport for "atomics" with rwlocks | Sergei Golubchik | 2015-01-13 | 1 | -8/+0 |
|/ / |