summaryrefslogtreecommitdiff
path: root/storage/maria
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0' into 10.1Sergei Golubchik2017-08-083-4/+5
|\
| * Merge remote-tracking branch 'origin/5.5' into 10.0Vicențiu Ciorbaru2017-07-252-4/+4
| |\
| | * ma_check/mi_check: maria_repair_parallel initialization for !quickDaniel Black2017-07-181-1/+3
| | * change flags as it was done in MyISAMSergei Golubchik2017-07-151-3/+1
| | * ma_recovery: unintentional order of operationsDaniel Black2017-07-151-1/+1
| * | MDEV-12824 GCC 7 warning: this statement may fall through [-Wimplicit-fallthr...Sergei Golubchik2017-07-201-0/+1
* | | Merge branch '10.0' into 10.1Sergei Golubchik2017-07-072-1/+4
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2017-07-062-1/+4
| |\ \ | | |/
| | * ma_pagecache: release lock in pagecache_readDaniel Black2017-07-031-0/+1
| | * ma_loghandler: translog_set_only_in_buffers failed to release lockDaniel Black2017-07-031-1/+2
| | * ma_loghandler: release file_header_lock on errorDaniel Black2017-07-031-0/+1
* | | Merge 10.0 into 10.1Marko Mäkelä2017-05-234-22/+37
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0mariadb-10.0.31Sergei Golubchik2017-05-201-8/+17
| |\ \ | | |/
| | * Make IF clear.Oleksandr Byelkin2017-05-181-8/+17
| | * MDEV-12230 include/my_sys.h:600:43: error: unknown type name ‘PSI_file_keyâ...Sergei Golubchik2017-04-201-2/+2
| * | MDEV-6262 analyze the coverity report on mariadbSergei Golubchik2017-05-194-14/+20
| * | Silence bogus GCC 7 warnings -Wimplicit-fallthroughMarko Mäkelä2017-05-172-2/+3
* | | Silence bogus GCC 7 warnings -Wimplicit-fallthroughMarko Mäkelä2017-05-172-2/+3
* | | Merge branch '10.0' into 10.1Sergei Golubchik2017-05-081-13/+46
|\ \ \ | |/ /
| * | MDEV-10104 Table lock race condition with replicationMonty2017-05-051-13/+46
* | | Merge branch '10.0' into 10.1Sergei Golubchik2017-03-211-5/+6
|\ \ \ | |/ /
| * | MDEV-12261 build failure without P_SSergei Golubchik2017-03-151-4/+4
* | | Correct FSF addressiangilfillan2017-03-10134-134/+134
* | | typo fixedSergei Golubchik2017-03-101-1/+1
* | | Merge 10.0 into 10.1Marko Mäkelä2017-03-101-7/+7
|\ \ \ | |/ /
| * | Use correct integer format with printf-like functions.Marko Mäkelä2017-03-091-7/+7
* | | Merge 10.0 into 10.1Marko Mäkelä2017-03-098-209/+190
|\ \ \ | |/ /
| * | 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
| * | Post MDEV-11902 Fix test failures in maria and myisam storage enginesVicențiu Ciorbaru2017-03-031-0/+5
| * | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-03-038-92/+69
| |\ \ | | |/
| | * bugfix: remove my_delete_with_symlink()Sergei Golubchik2017-02-271-27/+30
| | * race-condition safe implementation of mi_delete_table/maria_delete_tableSergei Golubchik2017-02-271-8/+3
| | * cleanup: remove now-unused argumentSergei Golubchik2017-02-274-11/+11
| | * MDEV-11902 mi_open race conditionSergei Golubchik2017-02-271-25/+23
| | * cleanup: remove 16-year-old "TODO"Sergei Golubchik2017-02-274-13/+8
| | * cleanup: mysys_test_invalid_symlinkSergei Golubchik2017-02-273-12/+2
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-12-111-3/+0
|\ \ \ | |/ /
| * | Remove labs() warning from maria and myisam storage enginesVicențiu Ciorbaru2016-12-011-3/+0
* | | MDEV-10759 Fix Aria to support 2-byte collation IDsMonty2016-12-026-18/+28
* | | MDEV-10041: Server crashes sporadically during bootstrap while running wsrep ...Nirbhay Choubey2016-09-281-1/+2
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-06-288-257/+225
|\ \ \ | |/ /
| * | Merge branch '5.5' into bb-10.0Sergei Golubchik2016-06-218-290/+248
| |\ \ | | |/
| | * Fix typo bug that cause myisam repair to failmariadb-5.5.50Vicențiu Ciorbaru2016-06-161-1/+1
| | * Fix compilation failure when compiling with std=c90Vicențiu Ciorbaru2016-06-161-3/+2
| | * MDEV-9256 : Crashes on Windows x64 with aria_pagecache_buffer_size > 4GBVladislav Vaintroub2016-06-143-37/+37
| | * MDEV-10162: Update repair testcaseVicențiu Ciorbaru2016-06-141-6/+2
| | * Fixed compilation failure using clangVicențiu Ciorbaru2016-06-142-137/+155
| | * [Code cleanup] Refactor duplicate code within myisam and maria sort.ccVicențiu Ciorbaru2016-06-141-36/+26
| | * MDEV-9994 - Aria service threads are not "joined"Sergey Vojtovich2016-06-104-61/+26