summaryrefslogtreecommitdiff
path: root/sql/filesort.cc
Commit message (Expand)AuthorAgeFilesLines
* MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-5/+10
* remove HAVE_EXPLICIT_TEMPLATE_INSTANTIATIONSergei Golubchik2012-12-171-4/+0
* Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-2/+2
|\
| * mysql-5.5.28Sergei Golubchik2012-10-161-2/+2
| |\
| | * merge 5.1 => 5.5Tor Didriksen2012-07-271-4/+2
| | |\
| | | * Bug#14111180 HANDLE_FATAL_SIGNAL IN PTR_COMPARE_1 / QUEUE_INSERTTor Didriksen2012-07-271-3/+2
* | | | SHOW EXPLAIN: merge to 10.0-base.Sergey Petrunya2012-10-061-12/+11
|\ \ \ \
| * \ \ \ SHOW EXPLAIN: merge with 5.5-mainSergey Petrunya2012-10-061-12/+11
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | MWL#182: Explain running statementsSergey Petrunya2012-06-251-5/+0
| | * | | SHOW EXPLAIN: Code cleanupSergey Petrunya2012-06-081-3/+0
| | * | | Merge of recent changes in MWL#182 in 5.3 with {Merge of MWL#182 with 5.5}Sergey Petrunya2012-05-171-9/+16
| | |\ \ \
| | | * | | MDEV-238: SHOW EXPLAIN: Server crashes in JOIN::print_explain with FROM subqu...Sergey Petrunya2012-05-101-0/+6
| | | * | | MWL#182: Explain running statementsSergey Petrunya2012-04-261-9/+11
* | | | | | Merge MDEV-415 -> 10.0-base.Igor Babaev2012-09-011-163/+389
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | MDEV-415: Back-port of the WL task #1393 from the mysql-5.6 code line.Igor Babaev2012-09-011-160/+389
| |/ / / /
* | | | | Merge from 5.3unknown2012-08-241-5/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Corrected the pactch for mdev-449 to fix valgrind failures.Igor Babaev2012-08-141-3/+3
| * | | | Fixed bug mdev-449.Igor Babaev2012-08-131-5/+7
| |/ / /
* | | | mysql 5.5.23 mergeSergei Golubchik2012-04-101-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Merge the 5.5.22 release build into main 5.5,Joerg Bruehe2012-03-201-100/+107
| |\ \ \
| * | | | Bug#13832772 ASSERTION `THD->IS_ERROR() || KILL_ERRNO'Tor Didriksen2012-03-141-1/+1
* | | | | mergeSergei Golubchik2012-04-071-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | mergeSergei Golubchik2012-04-051-1/+1
| |\ \ \ \
| | * \ \ \ mergeSergei Golubchik2012-04-051-13/+37
| | |\ \ \ \
| | | * \ \ \ mysql-5.1.62 mergeSergei Golubchik2012-04-051-13/+37
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-02-171-1/+1
| | | | |\ \ \
| | | | | * \ \ Updated/added copyright headersKent Boortz2012-02-151-1/+1
| | | | | |\ \ \
* | | | | | \ \ \ mysql-5.5.22 mergeSergei Golubchik2012-03-281-84/+65
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Bug#13633383 63183: SMALL SORT_BUFFER_SIZE CRASH IN MERGE_BUFFERSTor Didriksen2012-02-141-98/+81
| * | | | | | | | Merge 5.1-security => 5.5-securityTor Didriksen2012-01-271-12/+36
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Bug#13580775 ASSERTION FAILED: RECORD_LENGTH == M_RECORD_LENGTHTor Didriksen2012-01-271-12/+36
| | | |_|_|/ / | | |/| | | |
* | | | | | | Merge mariadb 5.3->mariadb 5.5unknown2012-03-241-41/+31
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Improve filesort performance for small sorts: Don't write pointers to records...unknown2012-03-241-38/+27
| * | | | | | Backport some simple performance patches from 5.5.unknown2012-03-221-2/+2
* | | | | | | Few simple performance fixes found with sysbench oltp.lua and Oprofile:unknown2012-03-211-2/+2
* | | | | | | Merge 5.3->5.5Igor Babaev2012-03-171-3/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fixed bug lp:917689 "Archive table corruption crashing MariaDB signal 11"Michael Widenius2012-03-131-3/+4
* | | | | | | Merged the implementation of MDEV-28 LIMIT ROWS EXAMINED into MariaDB 5.5.unknown2012-03-121-3/+4
|\ \ \ \ \ \ \ | |/ / / / / /
* | | | | | | 5.3 mergeSergei Golubchik2012-01-131-2/+14
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge with 5.2.Michael Widenius2011-12-111-5/+7
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge with 5.1Michael Widenius2011-11-301-1/+1
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Fixed compiler warningsMichael Widenius2011-11-301-1/+1
| | * | | | | Merge with MariaDB 5.1Michael Widenius2011-11-241-4/+6
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-4/+6
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
* | | | | | | 5.3->5.5 mergeSergei Golubchik2011-11-221-13/+18
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge.Igor Babaev2011-10-281-6/+5
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge.Igor Babaev2011-06-011-6/+5
| | |\ \ \ \ \ \
| | | * | | | | | Backported the test case for bug 43617 fixed by the patch for bug 42580.Igor Babaev2011-05-271-6/+5
| * | | | | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ...Michael Widenius2011-09-231-4/+4
| * | | | | | | | BUG#834514: Assertion `!table || (!table->read_set || bitmap_is_set(...' with...Sergey Petrunya2011-09-031-3/+9