summaryrefslogtreecommitdiff
path: root/storage/maria/maria_def.h
Commit message (Expand)AuthorAgeFilesLines
* Write error message if aria_log.??????? files are missingMonty2019-10-201-0/+1
* Merge 10.2 into 10.3Marko Mäkelä2019-09-041-0/+1
|\
| * Fix of query cache bug in AriaMonty2019-09-041-0/+1
* | Merge 10.2 into 10.3Marko Mäkelä2019-06-191-0/+8
|\ \ | |/
| * MDEV-19595 fixedMichael Widenius2019-06-191-0/+8
* | Merge 10.2 into 10.3Marko Mäkelä2019-05-141-1/+1
|\ \ | |/
| * Merge 10.1 into 10.2Marko Mäkelä2019-05-131-1/+1
| |\
| | * Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-111-1/+1
| | |\
| | | * Update FSF addressMichal Schorm2019-05-101-1/+1
* | | | Merge 10.2 into 10.3Marko Mäkelä2019-02-191-2/+2
|\ \ \ \ | |/ / /
| * | | Merge 10.1 into 10.2Marko Mäkelä2019-02-191-2/+2
| |\ \ \ | | |/ /
| | * | Fixed bug in macro _ma_mark_page_with_transid()Monty2019-02-191-2/+2
* | | | Merge 10.2 into 10.3Marko Mäkelä2018-09-061-0/+2
|\ \ \ \ | |/ / /
| * | | Merge 10.1 into 10.2Marko Mäkelä2018-08-311-0/+2
| |\ \ \ | | |/ /
| | * | MDEV-15797 Assertion `thd->killed != 0' failed in ha_maria::enable_indexesMonty2018-08-271-0/+2
* | | | Merge 10.2 into 10.3Marko Mäkelä2018-05-291-13/+1
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/10.1' into 10.2Monty2018-05-241-13/+1
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'origin/10.0' into 10.1Monty2018-05-241-13/+1
| | |\ \
| | | * | Fixes for Aria transaction handling with lock tablesMonty2018-05-221-13/+1
* | | | | Merge 10.2 into 10.3Marko Mäkelä2018-04-241-6/+6
|\ \ \ \ \ | |/ / / /
| * | | | Remove most 'register' use in C++Marko Mäkelä2018-04-241-6/+6
* | | | | Merge branch 'bb-10.2-ext' into 10.3Sergei Golubchik2018-02-231-0/+3
|\ \ \ \ \
| * \ \ \ \ Merge branch '10.2' into bb-10.2-extSergei Golubchik2018-02-221-0/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-02-221-0/+3
| | |\ \ \ \ | | | |/ / /
| | | * | | Fixed performance problem with Aria in find_head()Monty2018-02-171-0/+3
* | | | | | Make possible to use clang on Windows (clang-cl)Vladislav Vaintroub2018-02-201-2/+2
* | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-02-151-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2018-02-081-1/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'github/10.1' into 10.2Sergei Golubchik2018-02-061-1/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch 'github/10.0' into 10.1Sergei Golubchik2018-02-021-1/+2
| | | |\ \ \ | | | | |/ /
| | | | * | Merge remote-tracking branch '5.5' into 10.0Vicențiu Ciorbaru2018-01-241-1/+2
| | | | |\ \ | | | | | |/
| | | | | * compiler warningSergei Golubchik2018-01-151-1/+1
| | | | | * MDEV-8200 aria bug with insert select and lock tablesMonty2018-01-111-0/+1
* | | | | | Enusure that my_global.h is included firstMichael Widenius2017-08-241-0/+1
|/ / / / /
* | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-07-041-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Added tmp_disk_table_size to limit size of Aria temp tables in tmpdirMonty2017-06-301-0/+1
* | | | | Added "const" to new data for handler::update_row()Michael Widenius2017-04-181-1/+1
|/ / / /
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-301-4/+3
|\ \ \ \ | |/ / /
| * | | Correct FSF addressiangilfillan2017-03-101-1/+1
| * | | typo fixedSergei Golubchik2017-03-101-1/+1
| * | | Merge 10.0 into 10.1Marko Mäkelä2017-03-091-2/+1
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-03-031-2/+1
| | |\ \ | | | |/
| | | * cleanup: remove now-unused argumentSergei Golubchik2017-02-271-1/+1
| | | * cleanup: remove 16-year-old "TODO"Sergei Golubchik2017-02-271-2/+1
* | | | Fix many -Wconversion warnings.Marko Mäkelä2017-03-071-44/+44
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-12-291-2/+4
|\ \ \ \ | |/ / /
| * | | MDEV-10759 Fix Aria to support 2-byte collation IDsMonty2016-12-021-2/+4
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-06-301-1/+2
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2016-06-281-1/+2
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into bb-10.0Sergei Golubchik2016-06-211-1/+2
| | |\ \ | | | |/