summaryrefslogtreecommitdiff
path: root/mysql-test/suite/maria/lock.result
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.2 into 10.3Marko Mäkelä2019-10-181-0/+33
|\
| * Fixed bug in lock tables + alter table with Aria tables.Monty2019-10-161-0/+21
| * MDEV-10748 Server crashes in ha_maria::implicit_commitMonty2019-10-151-0/+12
* | Merge 10.2 into 10.3Marko Mäkelä2018-05-291-0/+11
|\ \ | |/
| * Add an end-marker to ease future mergesMarko Mäkelä2018-05-291-0/+1
| * Fixes for Aria transaction handling with lock tablesMonty2018-05-221-0/+10
* | MDEV-14669 Assertion `file->trn == trn' failed in ha_maria::start_stmtMonty2018-05-161-0/+24
|/
* Merge remote-tracking branch '5.5' into 10.0Vicențiu Ciorbaru2018-01-241-0/+69
|\
| * MDEV-8200 aria bug with insert select and lock tablesMonty2018-01-111-0/+69
* | More trivial test result updatesSergey Petrunya2013-07-081-2/+2
|/
* Fixed MDEV-366: Assertion `share->reopen == 1' failed in maria_extra on DROP ...Michael Widenius2012-08-151-0/+3
* More fixes for LOCK TABLE and REPAIR/FLUSHMichael Widenius2012-05-171-0/+19
* Fixed bug LP:973039 - Assertion `share->in_trans == 0' failed in maria_close ...Michael Widenius2012-05-161-0/+10