Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.1 into 10.2 | Eugene Kosov | 2019-07-09 | 1 | -1/+1 |
|\ | |||||
| * | Backport aria usage if LSN_FMT from 10.3 | Michael Widenius | 2019-06-25 | 1 | -1/+1 |
* | | MDEV-19055 Failures with temporary tables and Aria | Michael Widenius | 2019-06-17 | 1 | -0/+2 |
* | | 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 |
* | | | MDEV-17070 Table corruption or Assertion `table->file->stats.records > 0 || e... | Sergei Golubchik | 2019-03-12 | 1 | -3/+1 |
* | | | Merge branch '10.1' into 10.2 | Oleksandr Byelkin | 2018-09-14 | 1 | -5/+13 |
|\ \ \ | |/ / | |||||
| * | | post merge | Oleksandr Byelkin | 2018-09-07 | 1 | -9/+9 |
| * | | Merge branch '11.0' into 10.1 | Oleksandr Byelkin | 2018-09-06 | 1 | -3/+11 |
| |\ \ | |||||
| | * \ | Merge branch '5.5' into 10.0bb-10.0-merge-sanja | Oleksandr Byelkin | 2018-09-03 | 1 | -5/+13 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-16682 Assertion `(buff[7] & 7) == HEAD_PAGE' failed | Monty | 2018-09-03 | 1 | -5/+13 |
* | | | | Merge remote-tracking branch 'origin/10.1' into 10.2 | Monty | 2018-05-24 | 1 | -1/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge remote-tracking branch 'origin/10.0' into 10.1 | Monty | 2018-05-24 | 1 | -1/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Fixes for Aria transaction handling with lock tables | Monty | 2018-05-22 | 1 | -1/+2 |
* | | | | Merge branch 'github/10.1' into 10.2 | Sergei Golubchik | 2018-02-06 | 1 | -10/+10 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'github/10.0' into 10.1 | Sergei Golubchik | 2018-02-02 | 1 | -10/+10 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge remote-tracking branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2018-01-24 | 1 | -10/+10 |
| | |\ \ | | | |/ | |||||
| | | * | Fixed misleading voariable names. | Oleksandr Byelkin | 2018-01-11 | 1 | -9/+9 |
| | | * | MDEV-8200 aria bug with insert select and lock tables | Monty | 2018-01-11 | 1 | -1/+1 |
* | | | | MDEV-13384 - misc Windows warnings fixed | Vladislav Vaintroub | 2017-09-28 | 1 | -1/+1 |
|/ / / | |||||
* | | | Correct FSF address | iangilfillan | 2017-03-10 | 1 | -1/+1 |
* | | | simplify and unify my_safe_alloca usage | Sergei Golubchik | 2015-09-04 | 1 | -4/+2 |
* | | | Fixed failing tests and compiler warnings | Monty | 2015-08-18 | 1 | -4/+3 |
* | | | Push for testing of encryption | Monty | 2015-02-10 | 1 | -115/+155 |
|/ / | |||||
* | | Merge with 10.0-base | Michael Widenius | 2014-03-13 | 1 | -5/+7 |
|\ \ | |||||
| * \ | Merge with 5.5 | Michael Widenius | 2014-03-11 | 1 | -7/+15 |
| |\ \ | | |/ | |||||
| | * | Fixed a compiler failure and removed some warnings in windows | Michael Widenius | 2014-03-11 | 1 | -5/+7 |
| | * | Fixed MDEV-5724 "Server crashes on SQL select containing more group by and le... | Michael Widenius | 2014-03-10 | 1 | -2/+8 |
* | | | Fixed MDEV-5724 "Server crashes on SQL select containing more group by and le... | Michael Widenius | 2014-03-10 | 1 | -2/+8 |
* | | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -1/+1 |
* | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -4/+4 |
|\ \ \ | |/ / |/| | | |||||
| * | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -4/+4 |
* | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -14/+59 |
|\ \ \ | | |/ | |/| | |||||
| * | | 5.3 merge. | Sergei Golubchik | 2013-05-20 | 1 | -14/+53 |
| |\ \ | |||||
| | * \ | 5.2 merge | Sergei Golubchik | 2013-05-20 | 1 | -14/+53 |
| | |\ \ | |||||
| | | * \ | 5.1 merge | Sergei Golubchik | 2013-05-20 | 1 | -14/+53 |
| | | |\ \ | |||||
| | | | * | | MDEV-4280: Assertion `empty_size == empty_size_on_page' failure in ma_blockre... | Michael Widenius | 2013-05-11 | 1 | -14/+53 |
| * | | | | | MDEV-4231: Possible bug in function _ma_apply_undo_row_insert() | Michael Widenius | 2013-05-11 | 1 | -0/+6 |
* | | | | | | 5.5 merge | Sergei Golubchik | 2013-04-14 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | MDEV-4243 Warnings/errors while compiling with clang | Sergei Golubchik | 2013-03-28 | 1 | -1/+1 |
* | | | | | | remove ULL() and LL(), because they're totally unnecessary | Sergei Golubchik | 2013-04-07 | 1 | -1/+1 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 1 | -1/+1 |
* | | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | 5.3->5.5 merge | Sergei Golubchik | 2012-11-22 | 1 | -4/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-736 LP:1004615 - Unexpected warnings "Encountered illegal value '' when ... | Sergei Golubchik | 2012-11-17 | 1 | -5/+4 |
| |/ / | |||||
* | | | Fixed compiler errors | Michael Widenius | 2012-08-14 | 1 | -0/+2 |
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge with 5.1 | Michael Widenius | 2011-11-30 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Fixed compiler warnings | Michael Widenius | 2011-11-30 | 1 | -1/+1 |