summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | merged mysql-5.0->mysql-5.0-securityGeorgi Kodinov2012-02-1722-37/+22
| | | |\ \ \ \ \
| | * | \ \ \ \ \ merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-02-1757-77/+145
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ merged mysql-5.5->mysql-5.5-securityGeorgi Kodinov2012-02-17132-160/+361
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Upmerge the AIX compile fix into 5.5.Joerg Bruehe2012-02-161-1/+3
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge compile fix for AIX into delivery tree.Joerg Bruehe2012-02-161-1/+3
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Compile fix needed for AIX,Joerg Bruehe2012-01-191-1/+3
| * | | | | | | | | | | Bug#13633383 63183: SMALL SORT_BUFFER_SIZE CRASH IN MERGE_BUFFERSTor Didriksen2012-02-144-99/+217
| * | | | | | | | | | | merge mysql-5.1-security->mysql-5.5-securityGeorgi Kodinov2012-02-1394-797/+1958
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | merge from 5.0-securityGeorgi Kodinov2012-02-1395-796/+1955
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Bug #13706828: UPGRADE YASSL FROM 1.7.2 TO 2.1.4Georgi Kodinov2012-02-1095-797/+1956
| * | | | | | | | | | | mergeGeorgi Kodinov2012-02-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | mergeGeorgi Kodinov2012-02-103-11/+117
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ mergeGeorgi Kodinov2012-02-103-11/+116
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge of fix for Bug#11765810.Martin Hansson2012-02-073-11/+116
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Bug #11765810 58813: SERVER THREAD HANGS WHEN JOIN + WHERE + GROUP BYMartin Hansson2012-02-073-11/+117
| * | | | | | | | | | | | | empty merge mysql-5.1-security->mysql-5.5-secruityGeorgi Kodinov2012-02-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | / / / / / / / / / / | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | empty merge of mysql-5.0-security->mysql-5.1-securityGeorgi Kodinov2012-02-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Bug#13706621 : UNIFY THE YASSL VERSIONS THAT WE USE BY BACKPORTING 5.1 Georgi Kodinov2012-02-1026-260/+372
| | * | | | | | | | | | | Bug#13706621 : UNIFY THE YASSL VERSIONS THAT WE USE BY BACKPORTING 5.1 Georgi Kodinov2012-02-1031-134/+93
| | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | empty weave merge mysql-5.1-security->mysql-5.5-securityGeorgi Kodinov2012-02-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | empty weave merge mysql-5.0-security->mysql-5.1-securityGeorgi Kodinov2012-02-060-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | merged mysql-5.0->mysql-5.0-securityGeorgi Kodinov2012-02-061-4/+6
| | | |\ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ merged mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-02-0645-3571/+1343
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2012-02-06132-349/+2589
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Bug#13593865 - 64037: CRASH IN HA_PARTITION::CREATE_HANDLERS ONMattias Jonsson2012-02-026-57/+124
| * | | | | | | | | | | | | | Merged from mysql-5.1-security Gopal Shankar2012-01-303-2/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Bug#13105873 :Valgrind Warning: CRASH IN FOREIGNGopal Shankar2012-01-303-2/+45
| * | | | | | | | | | | | | | Merge 5.1-security => 5.5-securityTor Didriksen2012-01-274-12/+122
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Bug#13580775 ASSERTION FAILED: RECORD_LENGTH == M_RECORD_LENGTHTor Didriksen2012-01-274-12/+122
| * | | | | | | | | | | | | | empty weave merge mysql-5.1-security->mysql-5.5-securityGeorgi Kodinov2012-01-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | empty weave merge mysql-5.0-security->mysql-5.1-securityGeorgi Kodinov2012-01-120-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | empty weave merge from mysql-5.0Georgi Kodinov2012-01-120-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ weave merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-01-1249-454/+1333
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ weave merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2012-01-1259-456/+1632
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge from mysql-5.1-security to mysql-5.5-securityJon Olav Hauglid2012-01-095-4/+89
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Backport from mysql-trunk of:Jon Olav Hauglid2012-01-095-4/+86
| * | | | | | | | | | | | | | | | | Merge mysql-5.1-security -> mysql-5.5-securityVasil Dimov2011-12-223-1/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Fix Bug#13510739 63775: SERVER CRASH ON HANDLER READ NEXT AFTER DELETE RECORD.Vasil Dimov2011-12-227-2/+71
| | | | | | | | | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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
| * | | | | | | | | | | | | | | | | | | | Raise version number after cloning 5.5.20Joerg Bruehe2011-12-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | Fix Bug #13860722 - INCOMPLETE PERFORMANCE SCHEMA INSTRUMENTATION IN INNODBJimmy Yang2012-03-204-13/+31
* | | | | | | | | | | | | | | | | | | | | | Bug#13832953 MY_STRNXFRM_UNICODE: ASSERTION `SRC' FAILED. | MY_STRNXFRM_UNIC...Alexander Barkov2012-03-203-2/+21
* | | | | | | | | | | | | | | | | | | | | | BUG #13619394: fixing incorrect revertBjorn Munch2012-03-161-1/+1
* | | | | | | | | | | | | | | | | | | | | | Merging from mysql-5.1 to mysql-5.5. Annamalai Gurusami2012-03-161-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Bug #11766634 59783: INNODB DATA GROWS UNEXPECTEDLY WHEN INSERTING, TRUNCATIN...Annamalai Gurusami2012-03-162-0/+8