Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Auto-merge from mysql-5.5.mysql-5.5.12clone-5.5.12-build | Alexander Nozdrin | 2011-04-08 | 11 | -6/+197 |
|\ | |||||
| * | Bug#11926811 / Bug#60625 Illegal mix of collations | Alexander Barkov | 2011-04-08 | 11 | -6/+197 |
* | | Empty merge from mysql-5.1-security. | Alexander Nozdrin | 2011-04-08 | 0 | -0/+0 |
|\ \ | |||||
| * \ | Auto-merge from mysql-5.1.clone-5.1.57-build | Alexander Nozdrin | 2011-04-08 | 21 | -78/+91 |
| |\ \ | |||||
* | \ \ | Auto-merge from mysql-5.5. | Alexander Nozdrin | 2011-04-08 | 24 | -145/+231 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | A patch for Bug#12325375: THE SERVER ON WINXP DOES NOT ALLOW CONNECTIONS | Alexander Nozdrin | 2011-04-08 | 3 | -30/+54 |
| * | | | manual merge 5.1-->5.5 (bug 11829681) | Gleb Shchepa | 2011-04-08 | 4 | -1/+26 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Bug #11829681 - 60295: ERROR 1356 ON VIEW THAT EXECUTES FINE AS A QUERY | Gleb Shchepa | 2011-04-08 | 4 | -1/+26 |
| * | | | Adjusting test result for bug#11765157. | Nirbhay Choubey | 2011-04-08 | 1 | -0/+2 |
| * | | | Merging patch for bug#11765157 from mysql-5.1. | Nirbhay Choubey | 2011-04-08 | 4 | -3/+44 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#11765157 - 58090: mysqlslap drops schema specified in | Nirbhay Choubey | 2011-04-08 | 4 | -3/+44 |
| * | | | null upmerge | Bjorn Munch | 2011-04-07 | 0 | -0/+0 |
| |\ \ \ | | |/ / | |||||
| | * | | merge from 5.1-mtr | Bjorn Munch | 2011-04-07 | 13 | -74/+21 |
| | |\ \ | |||||
| * | \ \ | merge from 5.5-mtr | Bjorn Munch | 2011-04-07 | 13 | -111/+105 |
| |\ \ \ \ | |||||
| | * \ \ \ | merge from 5.5 main | Bjorn Munch | 2011-04-07 | 11 | -200/+324 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Bug #12316050 MTR: --REPORT-TIMES GIVES TOO HIGH NUMBER FOR INITIALIZATION | Bjorn Munch | 2011-04-07 | 2 | -5/+14 |
| | * | | | | Bug #11760361 52764: EXTEND MYSQL-TEST-RUN SUPPORT FOR SUN STUDIO DBX BY ADDI... | Bjorn Munch | 2011-04-07 | 1 | -48/+75 |
| | * | | | | null upmerge | Bjorn Munch | 2011-04-05 | 0 | -0/+0 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | merge from 5.1 main | Bjorn Munch | 2011-04-05 | 17 | -130/+254 |
| | | |\ \ \ | |||||
| | * | \ \ \ | merge from 5.5 main | Bjorn Munch | 2011-04-05 | 57 | -1561/+1506 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | null-merge | Bjorn Munch | 2011-03-31 | 0 | -0/+0 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | | * | | | | | One more test suppression for rpl_extra_col_master tests | Bjorn Munch | 2011-03-31 | 1 | -0/+1 |
| | * | | | | | | null upmerge | Bjorn Munch | 2011-03-31 | 0 | -0/+0 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | merge from 5.1 main | Bjorn Munch | 2011-03-31 | 58 | -479/+831 |
| | | |\ \ \ \ \ | |||||
| | * | \ \ \ \ \ | merge from 5.5 main | Bjorn Munch | 2011-03-31 | 62 | -441/+982 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Small followup fix after MTR warning cleanup | Bjorn Munch | 2011-03-31 | 3 | -10/+2 |
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | |||||
| | | * | | | | | | | Small followup fix after MTR warning cleanup | Bjorn Munch | 2011-03-31 | 3 | -24/+3 |
| | * | | | | | | | | mtr: cleaned up some superfluos global warning suppressions | Bjorn Munch | 2011-03-30 | 11 | -54/+20 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | |||||
| | | * | | | | | | | mtr: cleaned up some superfluos global warning suppressions | Bjorn Munch | 2011-03-30 | 13 | -68/+35 |
* | | | | | | | | | | fixed a number for a missing warning | Georgi Kodinov | 2011-04-07 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | fixed a missing warning | Georgi Kodinov | 2011-04-07 | 1 | -0/+2 |
* | | | | | | | | | | merge mysql-5.1-security->mysql-5.5-security | Georgi Kodinov | 2011-04-07 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | merge mysql-5.0-security->mysql-5.1-security | Georgi Kodinov | 2011-04-07 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | merge mysql-5.0->mysql-5.0-securitymysql-5.0.93clone-5.0.93-build | Georgi Kodinov | 2011-04-07 | 26 | -357/+226 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ | merged mysql-5.1->mysql-5.1-security | Georgi Kodinov | 2011-04-07 | 87 | -612/+1222 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | merge mysql-5.0-security->mysql-5.1-security | Georgi Kodinov | 2011-03-21 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | merge | Georgi Kodinov | 2011-03-21 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Bug #59815: Missing License information with enterprise GPL packages | Georgi Kodinov | 2011-02-08 | 1 | -0/+1 |
| | * | | | | | | | | | | | merge 5.0->5.0-security | Georgi Kodinov | 2011-03-21 | 4 | -2210/+22 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ | merge mysql-5.1->mysql-5.1-security | Georgi Kodinov | 2011-03-21 | 6 | -2256/+52 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ | merge 5.5->5.5-security | Georgi Kodinov | 2011-04-07 | 141 | -2231/+2953 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | BUG#11815600 - [ERROR] INNODB COULD NOT FIND INDEX | Jon Olav Hauglid | 2011-04-07 | 1 | -1/+0 |
| * | | | | | | | | | | | | | | Merge from mysql-5.5.11-release | Sunanda Menon | 2011-04-07 | 8 | -195/+254 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | Merged the fix for bug #11936829 to 5.5.11 release mysql-5.5.11 | Georgi Kodinov | 2011-03-31 | 3 | -0/+70 |
| | * | | | | | | | | | | | | | | Per Jon Olav, change needed for Bug#11784056 | MySQL Build Team | 2011-03-22 | 1 | -1/+0 |
| | * | | | | | | | | | | | | | | merge | Sunanda Menon | 2011-03-22 | 5 | -194/+184 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | Bug#11815600 [ERROR] INNODB COULD NOT FIND INDEX PRIMARY | Jon Olav Hauglid | 2011-03-09 | 5 | -175/+171 |
| * | | | | | | | | | | | | | | | | merge mysql-5.1->mysql-5.5 | Georgi Kodinov | 2011-04-06 | 3 | -5/+71 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Bug #11758687: 50924: object names not resolved correctly | Georgi Kodinov | 2011-04-04 | 4 | -10/+80 |
| | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed a wrong name in a comment | Georgi Kodinov | 2011-04-05 | 1 | -1/+1 |