summaryrefslogtreecommitdiff
path: root/storage/maria/ha_maria.cc
Commit message (Expand)AuthorAgeFilesLines
* imporve clang buildEugene Kosov2019-06-251-1/+1
* Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-111-1/+1
|\
| * Update FSF addressMichal Schorm2019-05-101-1/+1
* | MDEV-15797 Assertion `thd->killed != 0' failed in ha_maria::enable_indexesMonty2018-08-271-0/+3
* | Merge remote-tracking branch 'origin/10.0' into 10.1Monty2018-05-241-81/+56
|\ \
| * | Fixes for Aria transaction handling with lock tablesMonty2018-05-221-81/+56
* | | Merge branch '10.0' into 10.1Sergei Golubchik2018-05-191-1/+3
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2018-05-191-0/+1
| |\ \ | | |/
| | * MDEV-654 Assertion `share->now_transactional' failed in flush_log_for_bitmap ...Monty2018-05-151-0/+1
| * | Fix that FLUSH TABLES FOR EXPORT also works for Aria tables.Monty2018-05-161-1/+1
| * | MDEV-14943 Alter table ORDER BY bugMonty2018-05-151-0/+1
* | | Merge branch 'github/10.0' into 10.1Sergei Golubchik2018-02-021-1/+6
|\ \ \ | |/ /
| * | Merge remote-tracking branch '5.5' into 10.0Vicențiu Ciorbaru2018-01-241-1/+6
| |\ \ | | |/
| | * MDEV-8200 aria bug with insert select and lock tablesMonty2018-01-111-1/+6
* | | Correct FSF addressiangilfillan2017-03-101-1/+1
* | | Merge 10.0 into 10.1Marko Mäkelä2017-03-091-119/+115
|\ \ \ | |/ /
| * | Merge 5.5 into 10.0Marko Mäkelä2017-03-081-115/+115
| |\ \ | | |/
| | * Fix some GCC 6.3.0 warnings in MyISAM and Maria.Marko Mäkelä2017-03-081-113/+113
| * | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-03-031-4/+0
| |\ \ | | |/
| | * cleanup: mysys_test_invalid_symlinkSergei Golubchik2017-02-271-4/+0
* | | MDEV-10759 Fix Aria to support 2-byte collation IDsMonty2016-12-021-2/+1
* | | MDEV-10041: Server crashes sporadically during bootstrap while running wsrep ...Nirbhay Choubey2016-09-281-1/+2
* | | Don't delete non existing .TMD and .OLD files for Aria internal temporary tablesMonty2015-11-101-1/+1
* | | MDEV-9010 Encryption preset file contains different configuration preset then...Sergei Golubchik2015-10-291-1/+1
* | | MDEV-8475 stale .TMM file causes MyiSAM and Aria engine to stop serving the t...Monty2015-08-181-2/+2
* | | - Renaming variables so that they don't shadow others (After this patch one c...Monty2015-07-061-1/+1
* | | remove Aria-only handler flagSergei Golubchik2015-04-081-5/+0
* | | Push for testing of encryptionMonty2015-02-101-0/+11
* | | Merge branch '10.0' into merge-wipSergei Golubchik2015-01-311-7/+22
|\ \ \ | |/ /
| * | 5.5 mergeSergei Golubchik2015-01-211-7/+22
| |\ \ | | |/
| | * MDEV-6871 Multi-value insert on MyISAM table that makes slaves crash (when us...Michael Widenius2014-12-151-7/+21
| | * MDEV-5120 Test suite test maria-no-logging failsSergei Golubchik2014-10-021-0/+1
* | | Merge branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-021-1/+1
|\ \ \ | |/ /
| * | MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-301-1/+1
* | | Merge 10.0.14 into 10.1Sergei Golubchik2014-10-151-11/+70
|\ \ \ | |/ /
| * | 5.5.39 mergeSergei Golubchik2014-08-071-7/+49
| |\ \ | | |/
| | * Fixed memory overflowMichael Widenius2014-07-311-39/+45
| | * Fix for MDEV-6493: Assertion `table->file->stats.records > 0 || error' failur...Michael Widenius2014-07-301-12/+48
| * | change Aria engine maturity to STABLESergei Golubchik2014-08-051-1/+1
| * | Fixed problem with very slow shutdown when using 100,000 MyISAM tables with d...Michael Widenius2014-07-191-3/+20
* | | cleanup: remove table->status from some enginesSergei Golubchik2014-10-011-11/+0
* | | MDEV-6137 better help for SET/ENUM sysvarsSergei Golubchik2014-06-191-10/+4
|/ /
* | MDEV-5314 - Compiling fails on OSX using clangSergey Vojtovich2014-02-191-11/+11
* | 10.0-base mergeSergei Golubchik2014-02-031-3/+11
|\ \
| * \ 5.5 mergeSergei Golubchik2014-02-011-3/+11
| |\ \ | | |/
| | * Fixed MDEV-4970: Wrong result with Aria table populated with disabled keysMichael Widenius2014-01-251-2/+9
| | * merge 5.3->5.5unknown2014-01-261-1/+2
| | |\
| | | * 5.2 mergeSergei Golubchik2014-01-211-1/+2
| | | |\
| | | | * 5.1 mergeSergei Golubchik2014-01-211-1/+2
| | | | |\
| | | | | * MDEV-5543 MyISAM repair unsafe usage of TMD files Sergei Golubchik2014-01-201-1/+2
View Lorry Controller Status