summaryrefslogtreecommitdiff
path: root/storage/maria
Commit message (Expand)AuthorAgeFilesLines
* Merge bb-10.2-ext into 10.3Marko Mäkelä2017-10-0436-470/+465
|\
| * Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-0236-470/+465
| |\
| | * 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
* | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-09-282-5/+6
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-09-282-5/+6
| |\ \ \ | | |/ /
| | * | Added missing test if table is transactional or not in AriaMonty2017-09-281-0/+1
| | * | Fixed compiler warningMonty2017-09-271-5/+5
* | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-09-252-9/+34
|\ \ \ \ | |/ / /
| * | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-251-8/+33
| |\ \ \ | | |/ /
| | * | 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
| * | | Merge branch '10.2' into bb-10.2-extSergei Golubchik2017-09-231-1/+1
| |\ \ \ | | |/ /
| | * | Fix that FLUSH TABLES FOR EXPORT also works for Aria tables.Monty2017-09-211-1/+1
* | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-09-011-1/+1
|\ \ \ \ | |/ / /
| * | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-011-1/+1
| |\ \ \ | | |/ /
| | * | Add ATTRIBUTE_NORETURN and ATTRIBUTE_COLDMarko Mäkelä2017-08-311-1/+1
* | | | Merge branch 'bb-10.2-ext' into 10.3Sergei Golubchik2017-08-263-4/+5
|\ \ \ \ | |/ / /
| * | | Merge branch '10.2' into bb-10.2-extSergei Golubchik2017-08-253-4/+5
| |\ \ \ | | |/ /
| | * | 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
* | | | | | Remove dumping of some not needed core's when running test suiteMichael Widenius2017-08-245-8/+8
* | | | | | Added DBUG_ASSERT_AS_PRINTF compile flagMonty2017-08-248-16/+14
* | | | | | Enusure that my_global.h is included firstMichael Widenius2017-08-244-3/+2
* | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3MDEV-9804Alexander Barkov2017-07-132-1/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-07-122-1/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | 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
* | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-07-057-15/+30
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-07-047-15/+30
| |\ \ \ \ \ | | |/ / / /
| | * | | | 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
* | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-06-197-33/+58
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-06-157-33/+58
| |\ \ \ \ \ | | |/ / / /
| | * | | | 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
| | | | |\ \ | | | | | |/