summaryrefslogtreecommitdiff
path: root/sql/filesort.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge with 5.3 mainMichael Widenius2011-05-161-3/+27
|\
| * MWL#89unknown2011-03-011-1/+1
| |\
| * \ Merge MWL#89 into 5.3 main.unknown2011-01-111-3/+27
| |\ \
| | * | Fix LP BUG#680943unknown2010-12-021-3/+27
* | | | Merge with MariaDB 5.2Michael Widenius2011-05-101-4/+3
|\ \ \ \ | |_|_|/ |/| | |
* | | | Fixed compiler warningsMichael Widenius2011-02-251-1/+1
| |/ / |/| |
* | | MergeIgor Babaev2010-12-271-46/+104
|\ \ \
| * \ \ Merge: mwl#24+mwl#21 5.1->5.2Igor Babaev2010-12-241-46/+104
| |\ \ \ | | |/ / | |/| |
| | * | Addressed the feedback from the review of Monty on the cumulative patch for Igor Babaev2010-12-191-38/+44
| | * | MWL #21: "index_merge: non-ROR intersection".Igor Babaev2010-12-011-0/+1
| | * | An implementation of index intersect via a modified Unique class.Igor Babaev2010-09-131-31/+82
* | | | MWL#121-124 DS-MRR support for key-ordered retrieval, etcSergey Petrunya2010-11-011-5/+10
|\ \ \ \ | |_|_|/ |/| | |
| * | | BUG#625841: Assertion `!table || (!table->read_set || bitmap_is_setSergey Petrunya2010-09-151-5/+10
* | | | Merge 5.2->5.3Sergey Petrunya2010-10-101-7/+17
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Fixed bug #607566.Igor Babaev2010-07-191-3/+5
| * | MergeIgor Babaev2010-07-171-2/+2
| |\ \
| | * | Fixed bug #604503.Igor Babaev2010-07-171-2/+2
| * | | Fix for LP#588251: doStartTableScan() result not checked.Michael Widenius2010-07-171-1/+2
| |/ /
| * | Fixed bug #603654.Igor Babaev2010-07-131-1/+8
* | | Improved speed of thr_alarm from O(N) to O(1). thr_alarm is used to handle ti...Michael Widenius2010-07-161-5/+7
|/ /
* | merge 5.1->5.2Sergei Golubchik2010-06-011-1/+3
|\ \ | |/
| * Fixed compiler warningsMichael Widenius2010-05-271-1/+0
| * Changed the fixes for the following bugs:Igor Babaev2010-05-251-1/+4
* | mergedSergei Golubchik2010-03-151-0/+2
|\ \ | |/
| * Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-0/+2
| |\
| | * Auto-merge.Ramil Kalimullin2010-01-291-0/+2
| | |\
| | | * Fix for bug#49897: crash in ptr_compare when char(0) NOT NULL Ramil Kalimullin2010-01-291-0/+2
* | | | Merge of the patch introducing virtual columns into maria-5.2Igor Babaev2009-11-111-0/+4
|\ \ \ \
| * | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.Igor Babaev2009-10-161-0/+4
| |/ / /
* | | | This is based on the userstatv2 patch from Percona and OurDelta.Michael Widenius2009-10-191-2/+2
|/ / /
* | | Updated documentation files to reflect MariaDB and not the Maria storage engi...Michael Widenius2009-09-031-0/+3
* | | We are now using Valgrind rather than purify, and have for quite some time.unknown2009-05-061-2/+2
* | | Merge with base MySQL 5.1Michael Widenius2009-02-151-3/+0
|\ \ \ | |/ /
| * | Bug #41543: Assertion `m_status == DA_ERROR' failed in Diagnostics_area::sql_...Georgi Kodinov2009-01-091-3/+0
* | | Merged 5.1 with maria 5.1Michael Widenius2008-10-101-13/+53
|\ \ \ | |/ /
| * | Merge fix for BUG#35478 into 5.1Sergey Petrunia2008-07-151-13/+53
| |\ \ | | |/
| | * BUG#35478: sort_union() returns bad data when sort_buffer_size is hitSergey Petrunia2008-07-151-13/+53
| | * Merge kaamos.(none):/data/src/mysql-5.0unknown2008-03-121-2/+1
| | |\
* | | \ Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-2/+8
|\ \ \ \ | |/ / /
| * | | Merge kaamos.(none):/data/src/mysql-5.1unknown2008-03-121-2/+1
| |\ \ \
| | * \ \ Merge kaamos.(none):/data/src/mysql-5.1unknown2008-02-171-2/+1
| | |\ \ \
| | | * \ \ Merge kaamos.(none):/data/src/opt/mysql-5.0-optunknown2008-02-141-2/+1
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Bug#31590: Wrong error message on sort buffer being too small.unknown2008-02-081-2/+1
| * | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50unknown2008-01-301-0/+7
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |
| | * | | Bug #32149 Long semaphore wait for adaptive hash latchunknown2008-01-301-0/+7
| | | |/ | | |/|
* | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2008-02-051-8/+16
|\ \ \ \ | |/ / /
| * | | Merge ramayana.hindu.god:/home/tsmith/m/bk/51unknown2008-01-221-8/+16
| |\ \ \ | | | |/ | | |/|
| | * | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-optunknown2008-01-101-2/+6
| | |\ \ | | | |/
| | | * filesort.cc:unknown2008-01-101-2/+6
| | * | Post-merge fix after merging 5.0 -> 5.1. Replaced 'byte' with 'uchar'.unknown2008-01-101-6/+6