summaryrefslogtreecommitdiff
path: root/storage/maria/ma_sort.c
Commit message (Expand)AuthorAgeFilesLines
* fix the build and compiler warnings (few of which were real bugs)Sergei Golubchik2011-10-291-4/+2
* merge with 5.3Sergei Golubchik2011-10-191-5/+34
|\
| * Added progress reporting for alter table, LOAD DATA INFILE and for aria table...Michael Widenius2011-07-011-1/+24
| * Merge with 5.1Michael Widenius2011-01-111-4/+10
| |\
| | * merge with 5.1Michael Widenius2011-01-071-4/+10
| | |\
| | | * Don't do DBUG_ASSERT for checksum errors when using REPAIRMichael Widenius2011-01-071-4/+10
* | | | use PSI wrappers in aria and other non-MySQL codeSergei Golubchik2011-07-131-6/+6
* | | | post-merge fixes.Sergei Golubchik2011-07-021-2/+0
* | | | lots of post-merge changesSergei Golubchik2011-04-251-13/+13
|/ / /
* | | Merge 5.2->5.3Sergey Petrunya2010-10-101-4/+4
|\ \ \ | |/ /
| * | rename maria to ariaSergei Golubchik2010-09-121-4/+4
| |/
* | Improved speed of thr_alarm from O(N) to O(1). thr_alarm is used to handle ti...Michael Widenius2010-07-161-3/+3
|/
* Remove compiler warnings (Including some warnings from -Wstrict-aliasing)Michael Widenius2009-11-301-5/+6
* Code cleanup:Michael Widenius2009-01-091-16/+16
* Added versioning of Maria indexMichael Widenius2008-06-261-11/+25
* WL#3138: Maria - fast "SELECT COUNT(*) FROM t;" and "CHECKSUM TABLE t"unknown2008-05-291-3/+4
* Merge of changes in MyISAM since December 16 -> April 1unknown2008-04-011-2/+4
* Fixed after-merge problems.unknown2007-12-161-6/+6
* Added MARIA_SHARE *share to a lot of places to make code simplerunknown2007-12-101-1/+1
* Fixed repair_by_sort to work with BLOCK_RECORDunknown2007-11-281-1/+3
* First part of redo/undo for key pagesunknown2007-11-141-3/+2
* Merge bk-internal.mysql.com:/home/bk/mysql-mariaunknown2007-10-101-12/+13
|\
| * Moved randomize and my_rnd under mysysunknown2007-10-091-12/+13
* | After merge fixes. Applied changes made in myisam manually to maria.unknown2007-10-041-52/+51
|/
* merging MyISAM changes into Maria (not done in 5.1->maria merge ofunknown2007-07-271-7/+10
* Merged with mysql-5.1 main tree.unknown2007-07-021-66/+66
* GPL license update (same change as was done for all files in 5.1).unknown2007-03-021-2/+1
* merge from MyISAM into Maria (last step of merge of 5.1 into Maria).unknown2007-03-011-3/+3
* After merge fixesunknown2007-01-261-2/+1
* Merge with new versionunknown2007-01-231-70/+72
|\
| * Implementation of rows-in-blockunknown2007-01-181-66/+66
* | Maria - merging recent changes done to MyISAM into Maria.unknown2006-12-191-111/+145
* | Manually merging changes made to MyISAM into Maria. End of merge.unknown2006-09-071-6/+5
|/
* Completion of merge of mysql-5.1 into mysql-maria.unknown2006-08-101-0/+1
* Added storage/maria (based on MyISAM). WL#3245unknown2006-04-111-0/+1021