summaryrefslogtreecommitdiff
path: root/storage/maria/ha_maria.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2020-04-271-1/+1
|\
| * Aria: Avoid unused variables in embedded serverMarko Mäkelä2020-04-271-1/+1
| * imporve clang buildEugene Kosov2019-06-251-1/+1
* | Fix of query cache bug in AriaMonty2019-09-041-2/+19
* | Remove a conditionally unused declarationMarko Mäkelä2019-07-191-1/+4
* | MDEV-14996 kill during FLUSH TABLES FOR EXPORT causes assertMonty2019-06-271-1/+1
* | MDEV-19595 fixedMichael Widenius2019-06-191-1/+3
* | MDEV-18078 Assertion `trnman_has_locked_tables(trn) > 0' failedMichael Widenius2019-06-181-1/+2
* | MDEV-18207: ASAN heap-use-after-free in _ma_get_status upon concurrent operat...Vlad Lesin2019-05-311-2/+5
* | 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.1 into 10.2Marko Mäkelä2018-08-311-0/+3
|\ \ \ | |/ /
| * | MDEV-15797 Assertion `thd->killed != 0' failed in ha_maria::enable_indexesMonty2018-08-271-0/+3
* | | Merge remote-tracking branch 'origin/10.1' into 10.2Monty2018-05-241-81/+56
|\ \ \ | |/ /
| * | 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.1' into 10.2Sergei Golubchik2018-05-201-0/+2
|\ \ \ \ | |/ / /
| * | | 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
* | | | Remove most 'register' use in C++Marko Mäkelä2018-04-241-1/+1
* | | | Merge branch 'github/10.1' into 10.2Sergei Golubchik2018-02-061-1/+6
|\ \ \ \ | |/ / /
| * | | 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
* | | | MDEV-13384 - misc Windows warnings fixedVladislav Vaintroub2017-09-281-6/+6
* | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT.Vladislav Vaintroub2017-09-281-2/+2
* | | | Fix that FLUSH TABLES FOR EXPORT also works for Aria tables.Monty2017-09-211-1/+1
* | | | MDEV-12756 rpl.rpl_killed_ddl fails in buildbot with 'Can't find record'Monty2017-05-171-1/+7
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-301-120/+116
|\ \ \ \ | |/ / /
| * | | 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-7635: Part 1Nirbhay Choubey2017-02-101-1/+1
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-12-291-2/+1
|\ \ \ \ | |/ / /
| * | | 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
* | | | Aria: test for ER_KEY_BASED_ON_GENERATED_VIRTUAL_COLUMNSergei Golubchik2016-12-121-0/+8
* | | | MDEV-10041: Server crashes sporadically during bootstrap while running wsrep ...Nirbhay Choubey2016-11-071-1/+2
* | | | MDEV-8542 - The "aria_recover" variable should be renamed "aria_recover_options"Sergey Vojtovich2015-11-261-3/+3
* | | | MDEV-8715 - Obsolete sql_alloc() in favor of THD::alloc() and thd_alloc()Sergey Vojtovich2015-11-261-2/+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
View Lorry Controller Status