summaryrefslogtreecommitdiff
path: root/storage/maria
Commit message (Expand)AuthorAgeFilesLines
* MDEV-8450: PATCH] Wrong macro expansion in Query_cache::send_result_to_client()Oleksandr Byelkin2015-09-061-1/+1
* Fixed overrun in key cache if one tried to allocate a key cacheMonty2015-08-131-11/+17
* Merge branch '5.5' into 10.0Sergei Golubchik2015-06-111-4/+2
|\
| * MDEV-3870 - Valgrind warnings on OPTIMIZE MyISAM or Aria TABLE with disabledSergey Vojtovich2015-06-091-4/+2
| * CRLF->LFSergei Golubchik2015-06-021-1/+1
* | 5.5 mergeSergei Golubchik2015-01-211-7/+22
|\ \ | |/
| * MDEV-6871 Multi-value insert on MyISAM table that makes slaves crash (when us...Michael Widenius2014-12-151-7/+21
| * MDEV-5120 Test suite test maria-no-logging failsSergei Golubchik2014-10-021-0/+1
* | rename st_my_thread_var::opt_info -> st_my_thread_var::keycache_linkSergei Golubchik2015-01-191-10/+10
* | MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-303-3/+2
* | MDEV-6255 DUPLICATE KEY Errors on SELECT .. GROUP BY that uses temporary and ...Michael Widenius2014-09-111-0/+2
* | 5.5.39 mergeSergei Golubchik2014-08-075-11/+61
|\ \ | |/
| * Fixed memory overflowMichael Widenius2014-07-311-39/+45
| * Fix for MDEV-6493: Assertion `table->file->stats.records > 0 || error' failur...Michael Widenius2014-07-305-16/+58
* | change Aria engine maturity to STABLESergei Golubchik2014-08-051-1/+1
* | Fixed problem with very slow shutdown when using 100,000 MyISAM tables with d...Michael Widenius2014-07-1925-92/+101
* | 5.5.38 mergeSergei Golubchik2014-06-061-1/+1
|\ \ | |/
| * MDEV-5485 Minor man pages formatting issuesSergei Golubchik2014-05-301-1/+1
* | Fixed compiler warningsMichael Widenius2014-06-041-2/+2
* | MDEV-6153 Trivial Lintian errors in MariaDB sources: spelling errors and wron...Sergei Golubchik2014-05-131-1/+1
* | MDEV-5815 MySQL BUG#11751736: DROP DATABASE STATEMENT SHOULD REMOVE .OLD SUFF...Sergei Golubchik2014-03-261-3/+10
* | Merge with 10.0-baseMichael Widenius2014-03-133-10/+11
|\ \
| * \ Merge with 5.5Michael Widenius2014-03-115-29/+42
| |\ \ | | |/
| | * Fixed a compiler failure and removed some warnings in windowsMichael Widenius2014-03-113-10/+11
| | * Fixed MDEV-5724 "Server crashes on SQL select containing more group by and le...Michael Widenius2014-03-104-21/+33
* | | Fixed MDEV-5724 "Server crashes on SQL select containing more group by and le...Michael Widenius2014-03-104-21/+33
* | | MDEV-5675 - Performance: my_hash_sort_bin is called too oftenSergey Vojtovich2014-03-061-1/+1
* | | MDEV-4447 MariaDB sources should have unix-style line endings everywhereSergei Golubchik2014-02-271-1/+1
* | | 10.0-base mergeSergei Golubchik2014-02-261-2/+2
|\ \ \ | |/ /
* | | MDEV-5314 - Compiling fails on OSX using clangSergey Vojtovich2014-02-1921-88/+91
* | | Fixed MDEV-3815: Aria engine return "The table is full" (ERROR 1114) insertin...Michael Widenius2014-02-114-12/+25
* | | Automatic mergeMichael Widenius2014-02-051-2/+2
|\ \ \
| * | | Fixes to get valgrind to work with jemallocMichael Widenius2014-01-021-2/+2
* | | | 10.0-base mergeSergei Golubchik2014-02-037-5/+19
|\ \ \ \ | | |/ / | |/| |
| * | | 5.5 mergeSergei Golubchik2014-02-017-5/+19
| |\ \ \ | | | |/ | | |/|
| | * | Fixed MDEV-4970: Wrong result with Aria table populated with disabled keysMichael Widenius2014-01-252-4/+11
| | * | merge 5.3->5.5unknown2014-01-261-1/+2
| | |\ \
| | | * \ 5.2 mergeSergei Golubchik2014-01-211-1/+2
| | | |\ \
| | | | * \ 5.1 mergeSergei Golubchik2014-01-214-4/+5
| | | | |\ \
| | | | | * | MDEV-5543 MyISAM repair unsafe usage of TMD files Sergei Golubchik2014-01-201-1/+2
| | | | | * | make 5.1 compiling with modern gcc.unknown2013-12-203-3/+3
| | * | | | | MySQL-5.5.35 mergeSergei Golubchik2014-01-225-0/+6
* | | | | | | MDEV-5574 Set AUTO_INCREMENT below max value of column.Sergei Golubchik2014-02-011-0/+7
| |_|_|_|_|/ |/| | | | |
* | | | | | 10.0-base mergeSergei Golubchik2013-12-161-0/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 5.5 mergeSergei Golubchik2013-12-151-0/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fixed compiler errors and warningsMichael Widenius2013-12-021-0/+2
* | | | | | MDEV-4243 [PATCH] Warnings/errors while compiling with clangSergei Golubchik2013-11-281-4/+3
* | | | | | MDEV-5220 - [PATCH] MariaDB 10.0.4 doesn't compile without perfschemaSergey Vojtovich2013-11-142-4/+6
* | | | | | merge 10.0-base -> 10.0unknown2013-10-292-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | merge 5.5->10.0-baseunknown2013-10-292-2/+2
| |\ \ \ \ \ | | |/ / / /