summaryrefslogtreecommitdiff
path: root/storage/myisammrg
Commit message (Expand)AuthorAgeFilesLines
* lots of post-merge changesSergei Golubchik2011-04-251-2/+2
* merge.Sergei Golubchik2010-11-258-27/+71
|\
| * Automerge with 5.2Michael Widenius2010-11-053-14/+11
| |\
| | * Automatic merge with 5.1Michael Widenius2010-11-043-14/+11
| | |\
| | | * Fix for: LP #634955: Assert in _ma_update_at_original_place()Michael Widenius2010-11-023-14/+11
| * | | Merge 5.2->5.3Sergey Petrunya2010-10-102-10/+5
| |\ \ \ | | |/ /
| | * | merge with 5.1Sergei Golubchik2010-09-112-7/+2
| | |\ \ | | | |/
| | | * Merge with MySQL 5.1.50Michael Widenius2010-08-272-7/+2
| | | |\
| | * | \ Merge with MariaDB 5.1.49Michael Widenius2010-08-051-3/+3
| | |\ \ \ | | | |/ /
| | | * | Merge with MySQL 5.1.49Michael Widenius2010-08-021-3/+3
| | | |\ \
| * | | | | Improved speed of thr_alarm from O(N) to O(1). thr_alarm is used to handle ti...Michael Widenius2010-07-164-8/+8
| |/ / / /
| * | | | merge 5.1->5.2Sergei Golubchik2010-06-012-60/+89
| |\ \ \ \ | | |/ / /
| | * | | After-merge fixes for MySQL 5.1.46 merge into MariaDB: result file update and...unknown2010-04-281-2/+3
| | * | | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-282-60/+88
| | |\ \ \
| * | | | | Maria WL#61unknown2010-04-011-0/+17
| |/ / / /
| * | | | Removed compiler warningMichael Widenius2010-03-302-1/+2
| * | | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-1/+1
| |\ \ \ \
| * \ \ \ \ Merge with MySQL 5.1, with following additions:unknown2009-11-161-2/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-153-10/+5
| |\ \ \ \ \ \
| * | | | | | | Apply Igor's fix:Sergey Petrunya2009-09-181-1/+1
| * | | | | | | Merge MySQL->MariaDBSergey Petrunya2009-09-085-22/+48
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Fixed problems in mergeMichael Widenius2009-05-191-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | We are now using Valgrind rather than purify, and have for quite some time.unknown2009-05-061-1/+1
| * | | | | | | | | Merged with mysql-5.1 tree.Michael Widenius2009-04-251-4/+4
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-013-7/+89
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-111-9/+18
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Fixed warnings and errors discovered by pushbuild2Michael Widenius2008-12-041-3/+3
| * | | | | | | | | | | Merged 5.1 with maria 5.1Michael Widenius2008-10-105-2/+37
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | wt: comments, OOM checks, test case for deadlock detectionSergei Golubchik2008-08-281-1/+1
| * | | | | | | | | | | | Merge mysql.com:/home/my/mysql-5.1unknown2008-04-282-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-162-5/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-09-272-5/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Fixed several bugs found by running *.test with maria engineunknown2007-09-031-1/+2
| | | * | | | | | | | | | | | | Merged with mysql-5.1 main tree.unknown2007-07-021-10/+10
| | | * | | | | | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-272-10/+12
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | merge from MyISAM into Maria (last step of merge of 5.1 into Maria).unknown2007-03-011-8/+10
| | | | * | | | | | | | | | | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-mariaunknown2007-02-281-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-12-201-2/+2
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-12-181-2/+2
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-10-101-2/+2
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-mariaunknown2006-09-071-2/+2
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | Patch for Bug#55854 (MySQL AB should not be AUTHOR, copyright incorrect).Alexander Nozdrin2010-08-121-2/+2
* | | | | | | | | | | | | | | | | | | | | | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2010-07-291-5/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-201-5/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-201-5/+0
* | | | | | | | | | | | | | | | | | | | | | | Merge trunk-bugfixing -> trunk-runtime.Konstantin Osipov2010-07-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Add a maintainer target to the warning-mode of the build scripts.Davi Arnaut2010-07-241-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | merge from mysql-trunk-bugfixingJon Olav Hauglid2010-07-193-6/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge.Davi Arnaut2010-07-153-11/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | WL#5486: Remove code for unsupported platformsDavi Arnaut2010-07-151-3/+0
View Lorry Controller Status