summaryrefslogtreecommitdiff
path: root/storage/maria/ma_extra.c
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.3 into 10.4Marko Mäkelä2019-10-101-3/+0
|\
| * Cleanup mman.h includesSergey Vojtovich2019-10-021-3/+0
* | Merge 10.3 into 10.4Marko Mäkelä2019-07-021-1/+0
|\ \ | |/
| * MDEV-17576 Assertion in maria_extra upon ALTER on table with triggers and locksMonty2019-06-251-1/+0
* | Merge branch '10.3' into 10.4Oleksandr Byelkin2019-05-191-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.3 into 10.4Marko Mäkelä2019-03-121-0/+2
|\ \ \ \ | |/ / /
| * | | MDEV-17070 Table corruption or Assertion `table->file->stats.records > 0 || e...Sergei Golubchik2019-03-121-0/+2
* | | | Optimize flush tables with read lock (FTWRL) to not wait for select'sMonty2018-12-091-0/+5
|/ / /
* | | Merge remote-tracking branch 'origin/10.1' into 10.2Monty2018-05-241-2/+2
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/10.0' into 10.1Monty2018-05-241-2/+2
| |\ \
| | * | Fixes for Aria transaction handling with lock tablesMonty2018-05-221-2/+2
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-10-241-2/+1
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2017-10-221-2/+1
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into 10.0Sergei Golubchik2017-10-181-2/+1
| | |\ \ | | | |/
| | | * MDEV-13459 Warnings, when compiling with gcc-7.xSergei Golubchik2017-10-171-1/+2
| | * | Silence bogus GCC 7 warnings -Wimplicit-fallthroughMarko Mäkelä2017-05-171-1/+2
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-221-1/+2
|\ \ \ \ | |/ / /
| * | | Silence bogus GCC 7 warnings -Wimplicit-fallthroughMarko Mäkelä2017-05-171-1/+2
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-301-1/+1
|\ \ \ \ | |/ / /
| * | | Correct FSF addressiangilfillan2017-03-101-1/+1
| |/ /
* | | compiler warningSergei Golubchik2016-09-121-1/+1
* | | MDEV-10216: Assertion `strcmp(share->unique_file_name,filename) ||Nirbhay Choubey2016-08-081-0/+1
|/ /
* | MDEV-5314 - Compiling fails on OSX using clangSergey Vojtovich2014-02-191-3/+3
* | Temporary commit of 10.0-mergeMichael Widenius2013-03-261-1/+1
|/
* Fixed lp:947474 "Assertion `table->file->stats.records > 0 || error' failed i...Michael Widenius2012-03-201-0/+2
* merge with 5.3Sergei Golubchik2011-10-191-27/+50
|\
| * Automatic merge with 5.2Michael Widenius2011-08-151-4/+4
| |\
| | * Merge in bug fix from 5.1Michael Widenius2011-08-151-1/+1
| | |\
| | | * Fixed bug lp:826377 "Aria DB Format: Reading specific table from dump causes ...Michael Widenius2011-08-151-1/+1
| | * | Optimize mutex usage.Michael Widenius2011-08-081-3/+3
| | |/
| * | merge Windows performance patches into 5.3Vladislav Vaintroub2011-07-051-2/+1
| |\ \
| | * | Backport Fix for Bug#24509 - 2048 file descriptor limit on windows needs incr...Vladislav Vaintroub2011-06-121-2/+1
| | |/
| * | Merge with 5.2Michael Widenius2011-03-091-19/+37
| |\ \ | | |/
| | * Fixes for Aria storage engine:Michael Widenius2011-02-101-13/+20
| | * Aria issues:Michael Widenius2011-01-241-6/+17
| * | Merge in new handler and handlersocket code into 5.3 mainMichael Widenius2011-02-221-2/+2
| |\ \
| | * \ Merge with 5.1Michael Widenius2011-01-111-2/+2
| | |\ \ | | | |/
| | | * - Fixed that Aria works with HANDLER commandsMichael Widenius2011-01-101-2/+2
| * | | Fix for lp:711565 "Index Condition Pushdown can make a thread hold MyISAM loc...Michael Widenius2011-02-181-0/+6
| |/ /
* | | use PSI wrappers in aria and other non-MySQL codeSergei Golubchik2011-07-131-28/+28
|/ /
* | Merge MariaDB-5.2 -> MariaDB 5.3Sergey Petrunya2010-03-201-0/+6
|\ \ | |/
| * When one does a drop table, the indexes are not flushed to disk before drop a...Michael Widenius2010-02-101-0/+6
* | Backport into MariaDB-5.2 the following:Sergey Petrunya2009-12-151-0/+9
|/
* Don't call _ma_decrement_open_count() for ma_extra(HA_EXTRA_PREPARE_FOR_DROP).Michael Widenius2009-10-061-2/+9
* Merge with mysql-maria treeMichael Widenius2009-02-191-4/+15
|\
| * Comments. Take bitmap mutex lock when changing bitmap.changed.Guilhem Bichot2009-02-091-1/+5
| * _ma_state_info_write numeric flags changed with constants.unknown2009-01-081-3/+10