summaryrefslogtreecommitdiff
path: root/storage/maria
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2017-12-141-1/+0
|\
| * Merge 10.0 into 10.1Marko Mäkelä2017-12-121-1/+0
| |\
| | * Fix a -Wimplicit-fallthrough warningMarko Mäkelä2017-11-101-1/+0
* | | Merge branch '10.1' into 10.2Sergei Golubchik2017-10-243-4/+3
|\ \ \ | |/ /
| * | Merge branch '10.0' into 10.1Sergei Golubchik2017-10-223-4/+3
| |\ \ | | |/
| | * Merge branch '5.5' into 10.0Sergei Golubchik2017-10-183-4/+3
| | |\
| | | * MDEV-13459 Warnings, when compiling with gcc-7.xSergei Golubchik2017-10-173-2/+4
| | | * MDEV-13595: mariadb-10.2.8/storage/maria/ma_loghandler.c:2730]: (style) Array...Oleksandr Byelkin2017-10-051-1/+1
* | | | Fixed compiler warningsMichael Widenius2017-10-181-1/+1
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-10-021-35/+24
|\ \ \ \ | |/ / /
| * | | cleanup: reduce code duplicationSergei Golubchik2017-09-271-34/+23
* | | | MDEV-13384 - misc Windows warnings fixedVladislav Vaintroub2017-09-2813-56/+56
* | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT.Vladislav Vaintroub2017-09-2830-382/+388
* | | | Added missing test if table is transactional or not in AriaMonty2017-09-281-0/+1
* | | | Fixed compiler warningMonty2017-09-271-5/+5
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-09-251-8/+33
|\ \ \ \ | |/ / /
| * | | MDEV-11846: ERROR 1114 (HY000) table full when performing GROUP BYVarun Gupta2017-09-241-8/+33
* | | | Fix that FLUSH TABLES FOR EXPORT also works for Aria tables.Monty2017-09-211-1/+1
* | | | Add ATTRIBUTE_NORETURN and ATTRIBUTE_COLDMarko Mäkelä2017-08-311-1/+1
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-08-173-4/+5
|\ \ \ \ | |/ / /
| * | | 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.1' into 10.2Sergei Golubchik2017-07-082-1/+4
|\ \ \ \ | |/ / /
| * | | 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
* | | | Fixed compilation warnings (while testing 32 bit builds)Monty2017-07-011-2/+2
* | | | Added tmp_disk_table_size to limit size of Aria temp tables in tmpdirMonty2017-06-305-11/+28
* | | | Simplify IO_CACHE by removing current_pos and end_pos as self-referencesVicențiu Ciorbaru2017-06-281-2/+0
* | | | Fix some printf format type mismatchMarko Mäkelä2017-06-061-8/+8
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-234-22/+37
|\ \ \ \ | |/ / /
| * | | 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
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-222-2/+3
|\ \ \ \ | |/ / /
| * | | Silence bogus GCC 7 warnings -Wimplicit-fallthroughMarko Mäkelä2017-05-172-2/+3
* | | | MDEV-12756 rpl.rpl_killed_ddl fails in buildbot with 'Can't find record'Monty2017-05-172-1/+10
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-05-091-13/+46
|\ \ \ \ | |/ / /
| * | | 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.1' into 10.2Sergei Golubchik2017-03-30134-356/+338
|\ \ \ \ | |/ / /