summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Auto-merge from mysql-5.5.mysql-5.5.12clone-5.5.12-buildAlexander Nozdrin2011-04-0811-6/+197
|\
| * Bug#11926811 / Bug#60625 Illegal mix of collationsAlexander Barkov2011-04-0811-6/+197
* | Empty merge from mysql-5.1-security.Alexander Nozdrin2011-04-080-0/+0
|\ \
| * \ Auto-merge from mysql-5.1.clone-5.1.57-buildAlexander Nozdrin2011-04-0821-78/+91
| |\ \
* | \ \ Auto-merge from mysql-5.5.Alexander Nozdrin2011-04-0824-145/+231
|\ \ \ \ | | |_|/ | |/| |
| * | | A patch for Bug#12325375: THE SERVER ON WINXP DOES NOT ALLOW CONNECTIONSAlexander Nozdrin2011-04-083-30/+54
| * | | manual merge 5.1-->5.5 (bug 11829681)Gleb Shchepa2011-04-084-1/+26
| |\ \ \ | | | |/ | | |/|
| | * | Bug #11829681 - 60295: ERROR 1356 ON VIEW THAT EXECUTES FINE AS A QUERYGleb Shchepa2011-04-084-1/+26
| * | | Adjusting test result for bug#11765157.Nirbhay Choubey2011-04-081-0/+2
| * | | Merging patch for bug#11765157 from mysql-5.1.Nirbhay Choubey2011-04-084-3/+44
| |\ \ \ | | |/ /
| | * | Bug#11765157 - 58090: mysqlslap drops schema specified inNirbhay Choubey2011-04-084-3/+44
| * | | null upmergeBjorn Munch2011-04-070-0/+0
| |\ \ \ | | |/ /
| | * | merge from 5.1-mtrBjorn Munch2011-04-0713-74/+21
| | |\ \
| * | \ \ merge from 5.5-mtrBjorn Munch2011-04-0713-111/+105
| |\ \ \ \
| | * \ \ \ merge from 5.5 mainBjorn Munch2011-04-0711-200/+324
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Bug #12316050 MTR: --REPORT-TIMES GIVES TOO HIGH NUMBER FOR INITIALIZATIONBjorn Munch2011-04-072-5/+14
| | * | | | Bug #11760361 52764: EXTEND MYSQL-TEST-RUN SUPPORT FOR SUN STUDIO DBX BY ADDI...Bjorn Munch2011-04-071-48/+75
| | * | | | null upmergeBjorn Munch2011-04-050-0/+0
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | merge from 5.1 mainBjorn Munch2011-04-0517-130/+254
| | | |\ \ \
| | * | \ \ \ merge from 5.5 mainBjorn Munch2011-04-0557-1561/+1506
| | |\ \ \ \ \
| | * \ \ \ \ \ null-mergeBjorn Munch2011-03-310-0/+0
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | One more test suppression for rpl_extra_col_master testsBjorn Munch2011-03-311-0/+1
| | * | | | | | null upmergeBjorn Munch2011-03-310-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | merge from 5.1 mainBjorn Munch2011-03-3158-479/+831
| | | |\ \ \ \ \
| | * | \ \ \ \ \ merge from 5.5 mainBjorn Munch2011-03-3162-441/+982
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Small followup fix after MTR warning cleanupBjorn Munch2011-03-313-10/+2
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Small followup fix after MTR warning cleanupBjorn Munch2011-03-313-24/+3
| | * | | | | | | | mtr: cleaned up some superfluos global warning suppressionsBjorn Munch2011-03-3011-54/+20
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | mtr: cleaned up some superfluos global warning suppressionsBjorn Munch2011-03-3013-68/+35
* | | | | | | | | | fixed a number for a missing warningGeorgi Kodinov2011-04-071-0/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | fixed a missing warningGeorgi Kodinov2011-04-071-0/+2
* | | | | | | | | | merge mysql-5.1-security->mysql-5.5-securityGeorgi Kodinov2011-04-071-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | merge mysql-5.0-security->mysql-5.1-securityGeorgi Kodinov2011-04-070-0/+0
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ merge mysql-5.0->mysql-5.0-securitymysql-5.0.93clone-5.0.93-buildGeorgi Kodinov2011-04-0726-357/+226
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ merged mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-04-0787-612/+1222
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | merge mysql-5.0-security->mysql-5.1-securityGeorgi Kodinov2011-03-211-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | mergeGeorgi Kodinov2011-03-211-0/+1
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Bug #59815: Missing License information with enterprise GPL packagesGeorgi Kodinov2011-02-081-0/+1
| | * | | | | | | | | | | merge 5.0->5.0-securityGeorgi Kodinov2011-03-214-2210/+22
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-03-216-2256/+52
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ merge 5.5->5.5-securityGeorgi Kodinov2011-04-07141-2231/+2953
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | BUG#11815600 - [ERROR] INNODB COULD NOT FIND INDEXJon Olav Hauglid2011-04-071-1/+0
| * | | | | | | | | | | | | | Merge from mysql-5.5.11-releaseSunanda Menon2011-04-078-195/+254
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Merged the fix for bug #11936829 to 5.5.11 release mysql-5.5.11Georgi Kodinov2011-03-313-0/+70
| | * | | | | | | | | | | | | | Per Jon Olav, change needed for Bug#11784056MySQL Build Team2011-03-221-1/+0
| | * | | | | | | | | | | | | | mergeSunanda Menon2011-03-225-194/+184
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Bug#11815600 [ERROR] INNODB COULD NOT FIND INDEX PRIMARYJon Olav Hauglid2011-03-095-175/+171
| * | | | | | | | | | | | | | | | merge mysql-5.1->mysql-5.5Georgi Kodinov2011-04-063-5/+71
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Bug #11758687: 50924: object names not resolved correctly Georgi Kodinov2011-04-044-10/+80
| | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Fixed a wrong name in a commentGeorgi Kodinov2011-04-051-1/+1