summaryrefslogtreecommitdiff
path: root/mysys/mf_iocache.c
Commit message (Expand)AuthorAgeFilesLines
* 5.3 mergeSergei Golubchik2012-01-131-1/+2
|\
| * Merge with 5.2.Michael Widenius2011-12-111-2/+4
| |\
| | * Merge with MariaDB 5.1Michael Widenius2011-11-241-2/+4
| | |\
| | | * Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-2/+4
| | | |\
* | | | \ 5.3->5.5 mergeSergei Golubchik2011-11-221-6/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge with 5.2Michael Widenius2011-09-101-5/+3
| |\ \ \ \ | | |/ / /
| | * | | Fixed that automatic killing of delayed insert thread (in flush, alter table ...Michael Widenius2011-09-091-5/+3
| * | | | Merge 5.2->5.3unknown2011-09-021-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Fixed non critical buffer overflow bug in open_binary_frm() that could cause ...Michael Widenius2011-09-011-1/+1
| | |/ /
* | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-2/+2
|\ \ \ \
| * \ \ \ Updated/added copyright headersKent Boortz2011-06-301-2/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | |\ \ \
| | | * | | Updated/added copyright headersKent Boortz2011-06-301-2/+3
* | | | | | merge with 5.3Sergei Golubchik2011-10-191-3/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Backport Fix for Bug#24509 - 2048 file descriptor limit on windows needs incr...Vladislav Vaintroub2011-06-121-3/+0
| | |_|_|/ | |/| | |
* | | | | post-merge fixes.Sergei Golubchik2011-07-021-2/+0
* | | | | 5.5-mergeSergei Golubchik2011-07-021-61/+26
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Remove configuration preprocessor symbols 'THREAD'Magne Mahre2011-01-111-37/+2
| * | | | Bug#58052 Binary log IO not being accounted for properlyMarc Alff2010-11-121-24/+24
* | | | | merge.Sergei Golubchik2010-11-251-4/+7
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge with MySQL 5.1.50Michael Widenius2010-08-271-4/+7
| |\ \ \ | | |/ /
| * | | Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-4/+10
| |\ \ \
| * | | | Fixed compiler warningsunknown2008-01-131-4/+4
| * | | | Added missing #ifdefunknown2007-11-291-0/+2
| * | | | Fixed repair_by_sort to work with BLOCK_RECORDunknown2007-11-281-0/+1
| * | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-mariaunknown2007-07-041-0/+1
| |\ \ \ \
| | * | | | Fixed REPAIR/CHECK/ANALYZE TABLE for tables with new BLOCK-ROW format.unknown2007-07-011-0/+1
* | | | | | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2010-07-291-4/+7
|\ \ \ \ \ \
| * \ \ \ \ \ Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-201-4/+7
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-201-4/+7
| | | |_|/ / | | |/| | |
* | | | | | Merge trunk-bugfixing -> trunk-runtime.Konstantin Osipov2010-07-271-1/+0
|\ \ \ \ \ \
| * | | | | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-1/+0
| |/ / / / /
* | | | | | merge from mysql-trunk-bugfixingJon Olav Hauglid2010-07-131-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-07-081-2/+2
* | | | | | Salvage comments added by Ingo while working on Konstantin Osipov2010-06-291-4/+48
|/ / / / /
* | | | | WL#2360 Performance schemaMarc Alff2009-12-091-23/+25
|/ / / /
* | | | Manual merge.Davi Arnaut2009-09-021-7/+10
|\ \ \ \ | | |_|/ | |/| |
| * | | Post-merge fix. Observe C declaration placement rules.Davi Arnaut2009-09-021-7/+9
* | | | merging bugfix from 5.0Anurag Shekhar2009-08-311-4/+7
|\ \ \ \ | |/ / /
| * | | Bug #44723 Larger read_buffer_size values can cause performance Anurag Shekhar2009-08-241-4/+7
* | | | Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1unknown2007-10-111-0/+1
| |/ / |/| |
* | | WL#3817: Simplify string / memory area types and make things more consistent ...unknown2007-05-101-126/+127
|/ /
* | Bug#25807 LOAD DATA INFILE does not work with Pipesunknown2007-02-201-15/+19
|/
* Bug#25807: LOAD DATA INFILE does not work with Pipesunknown2007-02-131-6/+35
* Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maintunknown2007-01-111-5/+1
|\
| * Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.0-maintunknown2007-01-111-5/+1
| |\
| | * Cset exclude: thek@kpdesk.mysql.com|ChangeSet|20061106104152|07628unknown2007-01-091-5/+1
| * | Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maintunknown2007-01-111-1/+5
| |\ \
* | \ \ Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maintunknown2007-01-111-1/+5
|\ \ \ \
| * \ \ \ Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maintunknown2007-01-111-1/+5
| |\ \ \ \ | | | |/ / | | |/| |