Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.2' into 10.3 | Monty | 2019-09-03 | 8 | -25/+30 |
|\ | |||||
| * | Updated mtr files to support different compiled in options | Monty | 2019-09-01 | 8 | -25/+30 |
* | | MDEV-19254 Server crashes in maria_status with partitioned table | Monty | 2019-08-19 | 2 | -0/+15 |
* | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-07-02 | 4 | -4/+58 |
|\ \ | |/ | |||||
| * | MDEV-14996 kill during FLUSH TABLES FOR EXPORT causes assert | Monty | 2019-06-27 | 2 | -0/+27 |
| * | MDEV-17576 Assertion in maria_extra upon ALTER on table with triggers and locks | Monty | 2019-06-25 | 2 | -4/+31 |
* | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-06-19 | 4 | -0/+121 |
|\ \ | |/ | |||||
| * | MDEV-19595 fixed | Michael Widenius | 2019-06-19 | 2 | -0/+43 |
| * | MDEV-19055 Failures with temporary tables and Aria | Michael Widenius | 2019-06-17 | 2 | -0/+78 |
* | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2019-03-17 | 2 | -0/+68 |
|\ \ | |/ | |||||
| * | Fixed bug in redo handling of batch insert in Aria | Monty | 2019-03-14 | 2 | -0/+68 |
* | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-12-18 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | MDEV-14576 Include full name of object in message about incorrect value for c... | Alexey Botchkov | 2018-12-16 | 1 | -1/+1 |
* | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-11-06 | 2 | -0/+163 |
|\ \ | |/ | |||||
| * | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-11-06 | 2 | -0/+163 |
| |\ | |||||
| | * | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-10-30 | 2 | -0/+163 |
| | |\ | |||||
| | | * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2018-10-27 | 2 | -0/+163 |
| | | |\ | |||||
| | | | * | MDEV-9137 MariaDB Crash on Query Using Aria Engine | Sergei Golubchik | 2018-09-22 | 2 | -0/+91 |
| | | | * | MDEV-9137 MariaDB Crash on Query Using Aria Engine | Sergei Golubchik | 2018-09-22 | 2 | -0/+5 |
| | | | * | MDEV-9137 MariaDB Crash on Query Using Aria Engine | Sergei Golubchik | 2018-09-22 | 2 | -0/+3 |
| | | | * | MDEV-9137 MariaDB Crash on Query Using Aria Engine | Sergei Golubchik | 2018-09-22 | 2 | -0/+64 |
* | | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2018-09-28 | 4 | -0/+89 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.1' into 10.2 | Oleksandr Byelkin | 2018-09-14 | 4 | -0/+89 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '11.0' into 10.1 | Oleksandr Byelkin | 2018-09-06 | 4 | -0/+89 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch '5.5' into 10.0bb-10.0-merge-sanja | Oleksandr Byelkin | 2018-09-03 | 2 | -0/+14 |
| | | |\ \ | | | | |/ | |||||
| | | | * | MDEV-16682 Assertion `(buff[7] & 7) == HEAD_PAGE' failed | Monty | 2018-08-30 | 2 | -0/+14 |
| | | * | | MDEV-17067 Server crash in write_block_record | Monty | 2018-08-24 | 2 | -1/+19 |
| | | * | | MDEV-17021 Server crash or assertion `length <= column->length' failure in wr... | Monty | 2018-08-24 | 2 | -0/+57 |
* | | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-09-06 | 2 | -0/+61 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-08-31 | 2 | -0/+61 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | MDEV-15797 Assertion `thd->killed != 0' failed in ha_maria::enable_indexes | Monty | 2018-08-27 | 2 | -0/+56 |
* | | | | | Fixed several issues with aria_chk | Monty | 2018-08-31 | 1 | -3/+3 |
* | | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2018-06-30 | 2 | -0/+53 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-06-21 | 2 | -0/+53 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge remote-tracking branch 'origin/10.0' into 10.1 | Alexander Barkov | 2018-06-20 | 2 | -0/+53 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge remote-tracking branch 'origin/5.5' into 10.0 | Alexander Barkov | 2018-06-20 | 2 | -0/+53 |
| | | |\ \ | | | | |/ | |||||
| | | | * | MDEV-16534 PPC64: Unexpected error with a negative value into auto-increment ... | Alexander Barkov | 2018-06-20 | 2 | -0/+54 |
* | | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-06-18 | 2 | -0/+128 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | MDEV-15352 AUTO_INCREMENT breaks after updating a column value to a negative ... | Alexander Barkov | 2018-06-14 | 2 | -0/+128 |
* | | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-05-29 | 2 | -0/+25 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Add an end-marker to ease future merges | Marko Mäkelä | 2018-05-29 | 2 | -0/+3 |
| * | | | | Merge remote-tracking branch 'origin/10.1' into 10.2 | Monty | 2018-05-24 | 2 | -0/+22 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge remote-tracking branch 'origin/10.0' into 10.1 | Monty | 2018-05-24 | 2 | -0/+22 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Fixes for Aria transaction handling with lock tables | Monty | 2018-05-22 | 2 | -0/+22 |
* | | | | | Merge branch 'github/10.2' into 10.3 | Sergei Golubchik | 2018-05-22 | 2 | -0/+33 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-05-20 | 2 | -0/+33 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-05-19 | 4 | -0/+54 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Fix that FLUSH TABLES FOR EXPORT also works for Aria tables. | Monty | 2018-05-16 | 2 | -0/+21 |
| | | * | | MDEV-14943 Alter table ORDER BY bug | Monty | 2018-05-15 | 2 | -0/+33 |
* | | | | | MDEV-14669 Assertion `file->trn == trn' failed in ha_maria::start_stmt | Monty | 2018-05-16 | 2 | -0/+44 |