summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge 5.5.24 back into main 5.5.Joerg Bruehe2012-05-0747-95/+755
|\
| * Bug#13871079 RQG_MYISAM_DML_ALTER_VALGRIND FAILS ON VALGRIND PN PB2Tor Didriksen2012-04-123-7/+26
| * merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2012-04-1215-135/+700
| |\
| * \ empty weave merge mysql-5.1-security->mysql-5.5-securityGeorgi Kodinov2012-04-100-0/+0
| |\ \
| | * \ merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-04-1019-14/+402
| | |\ \
| * | \ \ merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2012-04-1051-305/+1656
| |\ \ \ \
| * \ \ \ \ auto mere mysql-5.1-security->mysql-5.5-securityGeorgi Kodinov2012-04-061-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Bug #13934049: 64884: LOGINS WITH INCORRECT PASSWORD ARE ALLOWEDGeorgi Kodinov2012-04-061-1/+1
| * | | | | 5.1-security -> 5.5-security mergeSergey Glukhov2012-04-044-1/+125
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug#11766300 59387: FAILING ASSERTION: CURSOR->POS_STATE == 1997660512 (BTR_P...Sergey Glukhov2012-04-045-1/+124
| * | | | | Bug #11880012: INDEX_SUBQUERY, BLACKHOLE,Gleb Shchepa2012-03-283-1/+40
| * | | | | Fix Bug #13849910 - INNODB ASSERTS ON TOO LONG TABLENAME WHEN USING PARTITIONSJimmy Yang2012-03-221-5/+11
| * | | | | empty weave merge mysql-5.1-security->mysql-5.5-securityGeorgi Kodinov2012-03-210-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | empty weave merge mysql-5.0-security->mysql-5.1-securityGeorgi Kodinov2012-03-210-0/+0
| | |\ \ \ \
| | | * \ \ \ weave merge mysql-5.0->mysql-5.0-securityGeorgi Kodinov2012-03-218-18/+68
| | | |\ \ \ \
| | * | \ \ \ \ merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-03-2130-134/+480
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2012-03-2129-130/+392
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge from mysql-5.5 to mysql-5.5-securityJon Olav Hauglid2012-03-1510-147/+289
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge from mysql-5.5 to mysql-5.5-securityJon Olav Hauglid2012-03-153-1/+89
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge from mysql-5.5 to mysql-5.5-securityJon Olav Hauglid2012-03-1518-119/+380
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Bug#13721076 CRASH WITH TIME TYPE/TIMESTAMP() AND WARNINGS IN SUBQUERYTor Didriksen2012-03-144-1/+47
| * | | | | | | | | | | | Merge 5.1 => 5.5.Norvald H. Ryeng2012-03-123-12/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Bug#13031606 VALUES() IN A SELECT STATEMENT CRASHES SERVERNorvald H. Ryeng2012-03-123-12/+36
| * | | | | | | | | | | | Merged fix for a test case into 5.5 tree.Dmitry Lenev2012-03-112-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Fixed test case for bug #13105873 "valgrind warning:possibleDmitry Lenev2012-03-112-0/+2
| * | | | | | | | | | | | Bug #12408412: GROUP_CONCAT + ORDER BY + INPUT/OUTPUT SAME Georgi Kodinov2012-03-094-7/+52
| * | | | | | | | | | | | empty weave merge mysql-5.1-security->mysql-5.5-securityGeorgi Kodinov2012-03-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | empty weave merge mysql-5.0-security->mysql-5.1-securityGeorgi Kodinov2012-03-080-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | empty auto merge of mysql-5.0->mysql-5.0-securityGeorgi Kodinov2012-03-080-0/+0
| | | |\ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-03-0838-166/+1115
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2012-03-0848-195/+1193
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Auto-merge from mysql-5.1-security.Ramil Kalimullin2012-03-061-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | BUG#12537203 - CRASH WHEN SUBSELECTING GLOBAL VARIABLES IN Ramil Kalimullin2012-03-061-0/+1
| * | | | | | | | | | | | | | | Auto-merge from mysql-5.1-security.Ramil Kalimullin2012-03-054-1/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | BUG#12537203 - CRASH WHEN SUBSELECTING GLOBAL VARIABLES IN GEOMETRY FUNCTION ...Ramil Kalimullin2012-03-053-0/+14
| | * | | | | | | | | | | | | | Fix for BUG#12414917 - ISCLOSED() CRASHES ON 64-BIT BUILDS Ramil Kalimullin2012-03-053-1/+15
| * | | | | | | | | | | | | | | Null merge from mysql-5.1 to mysql-5.5. Annamalai Gurusami2012-03-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | The innodb plugin module cannot use DEBUG_SYNC_C facility on Windows. Annamalai Gurusami2012-03-012-2/+10
| * | | | | | | | | | | | | | | Null merge from mysql-5.1 to mysql-5.5Annamalai Gurusami2012-03-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Bug#13635833: MULTIPLE CRASHES IN FOREIGN KEY CODE WITH CONCURRENT DDL/DMLAnnamalai Gurusami2012-03-0117-2/+304
| * | | | | | | | | | | | | | | Bug#13635833: MULTIPLE CRASHES IN FOREIGN KEY CODE WITH CONCURRENT DDL/DMLAnnamalai Gurusami2012-02-2712-25/+186
| * | | | | | | | | | | | | | | BUG#13693012Luis Soares2012-02-245-12/+115
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Bug#13693012: SLAVE CRASHING ON INSERT STATEMENT WITH MERGE TABLE Luis Soares2012-02-245-12/+115
| * | | | | | | | | | | | | | | | auto-mergeTatjana Azundris Nuernberg2012-02-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | auto-mergeTatjana Azundris Nuernberg2012-02-223-9/+50
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ auto-mergeTatjana Azundris Nuernberg2012-02-223-9/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ auto mergeTatjana Azundris Nuernberg2012-02-191-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ BUG#13431369 - MAIN.VARIABLES-NOTEMBEDDED CRASHES THE SERVER SPORADICALLY ON ...Tatjana Azundris Nuernberg2012-02-193-9/+48
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | BUG#13431369 - MAIN.VARIABLES-NOTEMBEDDED CRASHES THE SERVER SPORADICALLY ON ...Tatjana Azundris Nuernberg2012-02-193-9/+50
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | BUG#13431369 - MAIN.VARIABLES-NOTEMBEDDED CRASHES THE SERVER SPORADICALLY ON ...Tatjana Azundris Nuernberg2012-02-173-9/+50