summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* MergeKent Boortz2010-12-29284-2849/+3310
|\
| * MergeKent Boortz2010-12-29321-3248/+3577
| |\
| | * - Added/updated copyright headersKent Boortz2010-12-28889-93816/+4032
* | | 5.1-bugteam->5.5-bugteam mergeSergey Glukhov2010-12-243-2/+29
|\ \ \ | |/ /
| * | Bug#57810 case/when/then : Assertion failed: length || !scaleSergey Glukhov2010-12-243-2/+29
* | | BUG #59055: RQG was broken after the checkin that removed rpl and rpl_ndb sui...Anitha Gopi2010-12-214-8/+1
* | | Bug #58699 cannot build with gcc dbg on solarisTor Didriksen2010-12-2113-14/+78
* | | automergeSergey Glukhov2010-12-210-0/+0
|\ \ \ | |/ /
| * | automergeSergey Glukhov2010-12-212-3/+5
| |\ \
* | \ \ automergeSergey Glukhov2010-12-212-3/+5
|\ \ \ \
| * \ \ \ Merged fix for BUG#59084 from 5.1-bugteam to 5.5-bugfixingSven Sandberg2010-12-212-3/+5
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | BUG#59084: rpl_do_grant started to fail on FreeBSD (presumably after BUG#49978)Sven Sandberg2010-12-212-3/+5
* | | | | 5.1-bugteam->5.5-bugteam mergeSergey Glukhov2010-12-212-0/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | test case fixSergey Glukhov2010-12-212-0/+2
* | | | | 5.1-bugteam->5.5-bugteam mergeSergey Glukhov2010-12-215-14/+52
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Bug#58030 crash in Item_func_geometry_from_text::val_strSergey Glukhov2010-12-215-14/+52
| |/ /
* | | Bug #56662 Assertion failed: next_insert_id == 0, file .\handler.ccunknown2010-12-216-66/+76
|\ \ \ | |/ /
| * | Bug #56662 Assertion failed: next_insert_id == 0, file .\handler.ccunknown2010-12-216-66/+76
* | | null-merged fix for test failure that was specific to 5.1Sven Sandberg2010-12-210-0/+0
|\ \ \ | |/ /
| * | Fixed pb failure.Sven Sandberg2010-12-202-12/+4
* | | Bug #59055 : Remove ndb tests from repositoryAnitha Gopi2010-12-21398-326553/+3
|\ \ \
| * | | Bug #59055 : Remove ndb tests from repository. Removal of tests from sys_vars...Anitha Gopi2010-12-20398-326553/+3
* | | | Some if simplifications in testsBjorn Munch2010-12-2016-36/+33
|\ \ \ \
| * \ \ \ null upmergeBjorn Munch2010-12-200-0/+0
| |\ \ \ \
| | * \ \ \ new merge from 5.1Bjorn Munch2010-12-20470-45480/+14416
| | |\ \ \ \
| * | \ \ \ \ new merge from 5.5Bjorn Munch2010-12-20252-1742/+8941
| |\ \ \ \ \ \
| | * \ \ \ \ \ mergeGeorgi Kodinov2010-12-171-1/+1
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | mergeGeorgi Kodinov2010-12-171-1/+1
| | | |\ \ \ \ \
| | | | * | | | | tree details update to mainGeorgi Kodinov2010-12-171-1/+1
| | | | | |_|_|/ | | | | |/| | |
| * | | | | | | some more if stmt simplificationsBjorn Munch2010-12-175-14/+14
| * | | | | | | null upmergeBjorn Munch2010-12-170-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | merge from 5.1 main up to 3474Bjorn Munch2010-12-17149-1774/+3861
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ merge from 5.5 mainBjorn Munch2010-12-17852-43479/+25524
| |\ \ \ \ \ \ \ \
* | | | | | | | | | Bug #59021 Valgrind warning in key_unpack()Tor Didriksen2010-12-201-0/+1
| |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | Merged BUG#49978 with (BUG#51264 + BUG#51925) in 5.5-bugteam.Sven Sandberg2010-12-193-12/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | bug#51925: 5.5 installed header file layout is incorrectJonathan Perkin2010-12-171-2/+2
| * | | | | | | | | bug#51925: 5.5 installed header file layout is incorrectJonathan Perkin2010-12-172-4/+6
| * | | | | | | | | bug#51264: MySQL.prefPane fails to runJonathan Perkin2010-12-171-8/+1
* | | | | | | | | | Disabled part of rpl_change_master that fails sporadically because of BUG#59037.Sven Sandberg2010-12-192-14/+2
* | | | | | | | | | Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.Sven Sandberg2010-12-19831-6319/+7921
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | BUG#49978: Replication tests don't clean up replication state at the endSven Sandberg2010-12-19740-5607/+6993
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge fix for BUG58948 to 5.5-bugteam.Sergey Vojtovich2010-12-171-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | BUG#58948 - Valgrind warning in do_handle_one_connection()Sergey Vojtovich2010-12-171-1/+1
* | | | | | | | | BUG#58985: Assertion tab->quick->index != 64 failed in make_join_select() Jorgen Loland2010-12-172-0/+56
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | mergeGeorgi Kodinov2010-12-170-0/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Empty merge of mysql-5.1.53 into 5.5.MySQL Build Team2010-11-180-0/+0
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ mergeGeorgi Kodinov2010-12-170-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | mergeGeorgi Kodinov2010-12-1717-73/+984
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ mergeGeorgi Kodinov2010-12-1726-92/+1100
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Merge follow-up: update test result.Alexander Nozdrin2010-12-171-9/+0