summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
*-. Empty upmerge of 5.0 and 5.1 version number increases, also from main 5.5Joerg Bruehe2011-12-160-0/+0
|\ \
| | * Empty merge (alignment of version number changesets).Joerg Bruehe2011-12-160-0/+0
| | |\
| | | * Empty merge of identical version number changes.Joerg Bruehe2011-12-160-0/+0
| | | |\
| | | * | Raise version number after cloning 5.0.95joerg.bruehe@oracle.com2011-12-161-2/+2
| | * | | Empty merge of version number changes.Joerg Bruehe2011-12-160-0/+0
| | |\ \ \
| | * | | | Raise version number after cloning 5.1.61joerg.bruehe@oracle.com2011-12-161-1/+1
| * | | | | Empty upmerge of 5.0 and 5.1 version number increases.Joerg Bruehe2011-12-160-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Empty upmerge of a 5.0 version number increase.Joerg Bruehe2011-12-160-0/+0
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Raise version number after cloning Joerg Bruehe2011-12-161-2/+2
| | * | | | Raise version number after cloning Joerg Bruehe2011-12-161-1/+1
* | | | | | Raise version number after cloning 5.5.20Joerg Bruehe2011-12-161-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Raise version number after cloning 5.5.20Joerg Bruehe2011-12-161-1/+1
* | | | | | Test case for BUG11763712 is intended for 5.1 only.Sergey Vojtovich2011-12-162-58/+0
* | | | | | merge. Disabled the added test in merge.test from 5.1.Mattias Jonsson2011-12-154-0/+60
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Post push fix for merge.test and mysqlcheck.test on windowsMattias Jonsson2011-12-153-3/+9
* | | | | | empty weave merge mysql-5.1-security->mysql-5.5-securityGeorgi Kodinov2011-12-150-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-12-159-3/+56
| |\ \ \ \ \ | | | |/ / / | | |/| | |
* | | | | | merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-12-1520-10/+128
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Bug#13344643:Format function in view looses locale informationChaithra Gopalareddy2011-12-153-0/+40
| * | | | | Bug#13463417 63487: ANNOYING TRACE MESSAGE IN CMAKE CODETor Didriksen2011-12-151-1/+0
| * | | | | bug#13437900Andrei Elkin2011-12-141-1/+1
| * | | | | Bug#13437900 - VALGRIND REPORTS A LEAK FOR REPL_IGNORE_SERVER_IDSAndrei Elkin2011-12-147-6/+19
| * | | | | Addendum to the fix for bug #11754011: fixed a testcase result to include Georgi Kodinov2011-12-141-0/+5
| * | | | | Bug#11754011: 45546: START WINDOWS SERVICE, THEN EXECUTE WHAT IS NEEDED.Georgi Kodinov2011-12-133-1/+35
| * | | | | Merging from mysql-5.1 to mysql-5.5. Annamalai Gurusami2011-12-133-1/+22
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Bug #13117023: Innodb increments handler_read_key when it should notAnnamalai Gurusami2011-12-137-2/+44
| * | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-12-122-1/+7
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug#13418887 ERROR IN DIAGNOSTIC FUNCTION PAGE_REC_PRINT()Marko Mäkelä2011-12-123-1/+12
* | | | | | merged bug#12361113.Mattias Jonsson2011-12-146-0/+95
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | mergeMattias Jonsson2011-12-144-0/+40
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | mergeMattias Jonsson2011-12-145-0/+49
| | |\ \ \ \
| | | * | | | Bug#12361113: CRASH WHEN "LOAD INDEX INTO CACHE" WITH TOOMattias Jonsson2011-12-125-0/+49
* | | | | | | empty weave merge mysql-5.1-security->mysql-5-5.securityGeorgi Kodinov2011-12-120-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | merge 5.1->5.1-security.Georgi Kodinov2011-12-1243-329/+1555
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
* | | | | | | merged 5.5->5.5-securityGeorgi Kodinov2011-12-12110-1318/+3822
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Bug #13116225 LIVE DOWNGRADE CRASHES WITH INNODB_PAGE_SIZE=4Kkevin.lewis@oracle.com2011-12-087-92/+193
| * | | | | | Fix Bug #13083023 - 60229: BROKEN COMPATIBILITY: ERROR WHILE CREATE TABLEJimmy Yang2011-12-074-0/+71
| * | | | | | Bug#11759044 - 51325: DROPPING AN EMPTY INNODB TABLE TAKES A LONG TIMEInaam Rana2011-12-077-78/+162
| * | | | | | Bug#13013970 MORE CRASHES IN FIELD_BLOB::GET_KEY_IMAGETor Didriksen2011-12-053-2/+22
| * | | | | | Bug#11761576 post-push fix: HAVE_EXPLICIT_TEMPLATE_INSTANTIATION in header fi...Tor Didriksen2011-12-022-14/+14
| * | | | | | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONSTor Didriksen2011-12-029-304/+435
| * | | | | | merge from mysql-5.1Inaam Rana2011-12-011-2/+4
| |\ \ \ \ \ \
| | * | | | | | Bug#13414773 -INNODB_FAST_SHUTDOWN=2, ASSERT STATE == BUF_BLOCK_ZIP_PAGEInaam Rana2011-12-011-2/+4
| | | |/ / / / | | |/| | | |
| * | | | | | BUG #11746897 - 29508: PLEASE IMPLEMENT MYSQL-TEST-RUN.PL --STRACE-MASTERsayantan.dutta@oracle.com2011-12-011-11/+45
| * | | | | | BUG#11745230Luis Soares2011-12-013-34/+227
| * | | | | | NULL merge 5.1 => 5.5Tor Didriksen2011-11-300-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONSTor Didriksen2011-11-301-0/+4
| * | | | | | Mostly NULL-merge 5.1 => 5.5 ofTor Didriksen2011-11-301-0/+257
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONSTor Didriksen2011-11-307-242/+620
| * | | | | | NULL merge 5.1 => 5.5Tor Didriksen2011-11-300-0/+0
| |\ \ \ \ \ \ | | |/ / / / /