Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Write error message if aria_log.??????? files are missing | Monty | 2019-10-20 | 1 | -0/+1 |
* | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-09-04 | 1 | -0/+1 |
|\ | |||||
| * | Fix of query cache bug in Aria | Monty | 2019-09-04 | 1 | -0/+1 |
* | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-06-19 | 1 | -0/+8 |
|\ \ | |/ | |||||
| * | MDEV-19595 fixed | Michael Widenius | 2019-06-19 | 1 | -0/+8 |
* | | 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 10.2 into 10.3 | Marko Mäkelä | 2019-02-19 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-02-19 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Fixed bug in macro _ma_mark_page_with_transid() | Monty | 2019-02-19 | 1 | -2/+2 |
* | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-09-06 | 1 | -0/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-08-31 | 1 | -0/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-15797 Assertion `thd->killed != 0' failed in ha_maria::enable_indexes | Monty | 2018-08-27 | 1 | -0/+2 |
* | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-05-29 | 1 | -13/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge remote-tracking branch 'origin/10.1' into 10.2 | Monty | 2018-05-24 | 1 | -13/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge remote-tracking branch 'origin/10.0' into 10.1 | Monty | 2018-05-24 | 1 | -13/+1 |
| | |\ \ | |||||
| | | * | | Fixes for Aria transaction handling with lock tables | Monty | 2018-05-22 | 1 | -13/+1 |
* | | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-04-24 | 1 | -6/+6 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Remove most 'register' use in C++ | Marko Mäkelä | 2018-04-24 | 1 | -6/+6 |
* | | | | | Merge branch 'bb-10.2-ext' into 10.3 | Sergei Golubchik | 2018-02-23 | 1 | -0/+3 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch '10.2' into bb-10.2-ext | Sergei Golubchik | 2018-02-22 | 1 | -0/+3 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-02-22 | 1 | -0/+3 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Fixed performance problem with Aria in find_head() | Monty | 2018-02-17 | 1 | -0/+3 |
* | | | | | | Make possible to use clang on Windows (clang-cl) | Vladislav Vaintroub | 2018-02-20 | 1 | -2/+2 |
* | | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2018-02-15 | 1 | -1/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2018-02-08 | 1 | -1/+2 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch 'github/10.1' into 10.2 | Sergei Golubchik | 2018-02-06 | 1 | -1/+2 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge branch 'github/10.0' into 10.1 | Sergei Golubchik | 2018-02-02 | 1 | -1/+2 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Merge remote-tracking branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2018-01-24 | 1 | -1/+2 |
| | | | |\ \ | | | | | |/ | |||||
| | | | | * | compiler warning | Sergei Golubchik | 2018-01-15 | 1 | -1/+1 |
| | | | | * | MDEV-8200 aria bug with insert select and lock tables | Monty | 2018-01-11 | 1 | -0/+1 |
* | | | | | | Enusure that my_global.h is included first | Michael Widenius | 2017-08-24 | 1 | -0/+1 |
|/ / / / / | |||||
* | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-07-04 | 1 | -0/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Added tmp_disk_table_size to limit size of Aria temp tables in tmpdir | Monty | 2017-06-30 | 1 | -0/+1 |
* | | | | | Added "const" to new data for handler::update_row() | Michael Widenius | 2017-04-18 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 1 | -4/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Correct FSF address | iangilfillan | 2017-03-10 | 1 | -1/+1 |
| * | | | typo fixed | Sergei Golubchik | 2017-03-10 | 1 | -1/+1 |
| * | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-09 | 1 | -2/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-03-03 | 1 | -2/+1 |
| | |\ \ | | | |/ | |||||
| | | * | cleanup: remove now-unused argument | Sergei Golubchik | 2017-02-27 | 1 | -1/+1 |
| | | * | cleanup: remove 16-year-old "TODO" | Sergei Golubchik | 2017-02-27 | 1 | -2/+1 |
* | | | | Fix many -Wconversion warnings. | Marko Mäkelä | 2017-03-07 | 1 | -44/+44 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-12-29 | 1 | -2/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-10759 Fix Aria to support 2-byte collation IDs | Monty | 2016-12-02 | 1 | -2/+4 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-06-30 | 1 | -1/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 1 | -1/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '5.5' into bb-10.0 | Sergei Golubchik | 2016-06-21 | 1 | -1/+2 |
| | |\ \ | | | |/ |